diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/hurd-console.default | 24 | ||||
| -rw-r--r-- | debian/hurd.install | 1 | ||||
| -rw-r--r-- | debian/patches/hurd_console_startup.patch | 27 | ||||
| -rwxr-xr-x | debian/rules | 2 |
5 files changed, 59 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 907854fc..5a3c753c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ hurd (20050513-3+SVN) unreleased; urgency=low * debian/rules (DEB_CONFIGURE_USER_FLAGS): Build iso9660fs.static as well. * debian/hurd-udeb.install: Added iso9660fs.static. + * debian/patches/hurd_console_startup.patch: New patch, adding + support for starting the Hurd console on bootup. + * debian/hurd-console.default: New file. + * debian/rules (install/hurd::) Install it into debian/tmp/etc/default. + * debian/rules/hurd.install: Ship debian/tmp/etc/default/hurd-console. -- Michael Banck <mbanck@debian.org> Sun, 12 Jun 2005 23:53:59 +0200 diff --git a/debian/hurd-console.default b/debian/hurd-console.default new file mode 100644 index 00000000..69084292 --- /dev/null +++ b/debian/hurd-console.default @@ -0,0 +1,24 @@ +# Options to start the Hurd console. + +# Set this to 'true' to run the Hurd console on bootup. +ENABLE='false' + +# The display driver, mandatory. Either `vga' or `ncursesw'. +DISPLAY='-d vga' + +# The keyboard driver, mandatory. Either `pc_kbd' or `xkb' from the +# console-driver-xkb package. +KBD='-d pc_kbd' +#KBD='-d xkb' + +# The keyboard repeater. Required for X11. +#KBD_REPEAT='--repeat=kbd' + +# The mouse driver. Optional. +#MOUSE='-d pc_mouse --protocol=ps/2' + +# The mouse repeater. Required for X11. +#MOUSE_REPEAT='--repeat=mouse' + +# The pc speaker. Optional. +#SPEAKER='-d generic_speaker' diff --git a/debian/hurd.install b/debian/hurd.install index 266d7971..2c37b7cd 100644 --- a/debian/hurd.install +++ b/debian/hurd.install @@ -62,3 +62,4 @@ debian/tmp/etc/login/.profile debian/tmp/etc/login/README debian/tmp/etc/ttys debian/tmp/dev/MAKEDEV +debian/tmp/etc/default/hurd-console diff --git a/debian/patches/hurd_console_startup.patch b/debian/patches/hurd_console_startup.patch new file mode 100644 index 00000000..4344dc68 --- /dev/null +++ b/debian/patches/hurd_console_startup.patch @@ -0,0 +1,27 @@ +--- daemons/runsystem.sh.orig 2001-12-20 18:29:33.000000000 +0100 ++++ daemons/runsystem.sh 2005-06-18 01:05:30.398035896 +0200 +@@ -127,10 +127,24 @@ + trap "kill -$sig \${runttys_pid}" $sig + done + ++ # Touch the first tty so that the Hurd console is certain to pick it ++ # and not some random other tty. ++ touch /dev/tty1 ++ + # This program reads /etc/ttys and starts the programs it says to. + ${RUNTTYS} & + runttys_pid=$! + ++ # Startup the Hurd console if configured. ++ if [ -e /etc/default/hurd-console ]; then ++ unset DISPLAY KBD KBD_REPEAT MOUSE MOUSE_REPEAT SPEAKER ++ . /etc/default/hurd-console ++ fi ++ if [ "$ENABLE" = "true" ]; then ++ console ${DISPLAY} ${KBD} ${KBD_REPEAT} \ ++ ${SPEAKER} ${MOUSE} ${MOUSE_REPEAT} -c /dev/vcs ++ fi ++ + # Wait for runttys to die, meanwhile handling trapped signals. + wait + diff --git a/debian/rules b/debian/rules index 103c0a78..8aa16126 100755 --- a/debian/rules +++ b/debian/rules @@ -41,6 +41,8 @@ install/hurd:: # fakeroot package mv debian/tmp/bin/fakeroot debian/tmp/bin/fakeroot-hurd + install -m664 debian/hurd-console.default debian/tmp/etc/default/hurd-console + SUID_PROGRAMS = /bin/ids /bin/login /bin/ps /bin/w binary-predeb/hurd:: |