This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository hurd.
commit 89fb63fd97bd2b8ffe0061f1ff8702df5db58320 Author: Samuel Thibault <[email protected]> Date: Thu Mar 20 02:22:44 2014 +0000 Allow to select between 8pixel and 9pixel glyphs * local/runsystem: Allow to pass VGA options from d-i boot menu. * local/finish-install.d/51hurd_config-console: Propagate VGA options to installed system. --- debian/changelog | 12 +++++----- .../local/finish-install.d/51hurd_config-console | 18 ++++++++++++++- debian/local/runsystem | 7 ++++-- debian/patches/newRPC.patch | 26 ++++++++++++++++++++++ 4 files changed, 54 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07162b9..a2b38e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hurd (1:0.5.git20140319-1) UNRELEASED; urgency=medium +hurd (1:0.5.git20140319-1) unstable; urgency=medium * New upstream snapshot. - patches/libports_stability.patch: Remove, merged upstream. @@ -6,13 +6,13 @@ hurd (1:0.5.git20140319-1) UNRELEASED; urgency=medium * control: Only Replace/Conflict old login package which was potentially shipping /bin/login. * local/securetty: Remove file, let it be installed by the login package. - - * debian/patches/rc.patch: Also make /etc/mtab point to /proc/mounts. + * patches/rc.patch: Also make /etc/mtab point to /proc/mounts. * patches/mount.patch: Also ignore exec option. + * local/runsystem: Allow to pass VGA options from d-i boot menu. + * local/finish-install.d/51hurd_config-console: Propagate VGA options to + installed system. -TODO: force 8/9 width in d-i, and copy to installed system - - -- Samuel Thibault <[email protected]> Thu, 06 Feb 2014 10:35:15 +0000 + -- Samuel Thibault <[email protected]> Thu, 20 Mar 2014 00:57:15 +0000 hurd (1:0.5.git20140203-1) unstable; urgency=low diff --git a/debian/local/finish-install.d/51hurd_config-console b/debian/local/finish-install.d/51hurd_config-console index 03cc769..55ea3d0 100755 --- a/debian/local/finish-install.d/51hurd_config-console +++ b/debian/local/finish-install.d/51hurd_config-console @@ -1,3 +1,19 @@ #!/bin/sh -[ -f /var/run/hurd-console.pid ] || sed -i -e "s/ENABLE='true'/ENABLE='false'/" /target/etc/default/hurd-console +if [ -f /var/run/hurd-console.pid ] +then + VGA_OPTIONS="" + for i in $(cat /proc/cmdline) ; do + case "$i" in + VGA_OPTIONS=*) + VGA_OPTIONS=${i#VGA_OPTIONS=} + ;; + esac + done + if [ -n "$VGA_OPTIONS" ] + then + sed -i -e "s/DISPLAY='-d vga'/DISPLAY='-d vga $VGA_OPTIONS'/" /target/etc/default/hurd-console + fi +else + sed -i -e "s/ENABLE='true'/ENABLE='false'/" /target/etc/default/hurd-console +fi diff --git a/debian/local/runsystem b/debian/local/runsystem index a59ff71..ddb4527 100755 --- a/debian/local/runsystem +++ b/debian/local/runsystem @@ -14,7 +14,7 @@ mem=`vmstat-hurd --size -k` if [ "$mem" -lt 240000 ] then echo "You only have ${mem}KiB memory." - echo "Debian GNU/Hurd installation has not been optimized for memory usage yet, and thus currently needs at least 256MiB memory, sorry." + echo "Debian GNU/Hurd installation has not been optimized for memory usage yet, and thus currently needs at least 512MiB memory, sorry." while true do sleep 60 @@ -42,6 +42,9 @@ for i in $envvars ; do TERM=*) term=yes ;; + VGA_OPTIONS=*) + VGA_OPTIONS=${i#VGA_OPTIONS=} + ;; esac done @@ -63,7 +66,7 @@ then . /etc/default/keyboard [ -z "$XKBLAYOUT" ] || LAYOUT="--keymap $XKBLAYOUT" fi - console -d vga -g -d pc_kbd --repeat=kbd $LAYOUT -d pc_mouse --repeat=mouse -c /dev/vcs & + console -d vga -g $VGA_OPTIONS -d pc_kbd --repeat=kbd $LAYOUT -d pc_mouse --repeat=mouse -c /dev/vcs & echo $! > /var/run/hurd-console.pid wait echo diff --git a/debian/patches/newRPC.patch b/debian/patches/newRPC.patch index 000f0e4..bf40dd5 100644 --- a/debian/patches/newRPC.patch +++ b/debian/patches/newRPC.patch @@ -24,3 +24,29 @@ index 2eed13c..dc768d3 100644 OBJS = $(SRCS:.c=.o) $(MIGSTUBS) HURDLIBS = ihash ports shouldbeinlibc OTHERLIBS = -lpthread +diff --git a/Makeconf b/Makeconf +index 5cf995d..5dba70c 100644 +--- a/Makeconf ++++ b/Makeconf +@@ -575,7 +575,7 @@ vpath %.defs $(top_srcdir)/hurd + # These we want to find in the libc include directory... + mach_defs_names = bootstrap exc mach mach4 \ + mach_host mach_port mach_timer_reply memory_object \ +- memory_object_default notify experimental ++ memory_object_default notify experimental gnumach + device_defs_names = dev_forward device device_reply device_request + + mach_defs = $(addsuffix .defs,$(mach_defs_names)) +diff --git a/exec/Makefile b/exec/Makefile +index 3ef742d..7507b0a 100644 +--- a/exec/Makefile ++++ b/exec/Makefile +@@ -22,7 +22,7 @@ makemode := server + + SRCS = exec.c main.c hashexec.c hostarch.c + OBJS = main.o hostarch.o exec.o hashexec.o \ +- execServer.o exec_startupServer.o exec_experimentalServer.o ++ execServer.o exec_startupServer.o exec_experimentalServer.o gnumachUser.o + + target = exec + #targets = exec exec.static -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
