diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-11 16:39:26 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-11 16:39:26 +0000 |
| commit | 7e3b6fb03b53425e54f37a4e15448033b85378c5 (patch) | |
| tree | 4f7236b9db4319940fc2553d828a013239709f05 /debian/local/runsystem | |
| parent | 11786baa63069b5cabbc989f0387a02209604583 (diff) | |
Add keyboard layout switch to d-i
* control: Make hurd-udeb depend on xkb-data-udeb. Make hurd
conflict/replace console-driver-xkb.
* rules: Add empty compose file for hurd-udeb.
* hurd.install: Do not install empty compose file.
* local/runsystem: Read keyboard layout from console-setup, restart the
console automatically.
Diffstat (limited to 'debian/local/runsystem')
| -rwxr-xr-x | debian/local/runsystem | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/debian/local/runsystem b/debian/local/runsystem index 198c0f84..b35131af 100755 --- a/debian/local/runsystem +++ b/debian/local/runsystem @@ -55,13 +55,25 @@ then touch /dev/tty1 echo -n "Starting the Hurd console..." - console -d vga -g -d pc_mouse --repeat=mouse -d pc_kbd --repeat=kbd -c /dev/vcs & - sleep 1 + while true + do + LAYOUT="" + if [ -f /etc/default/keyboard ] + then + . /etc/default/keyboard + [ -z "$XKBLAYOUT" ] || LAYOUT="--keymap $XKBLAYOUT" + fi + console -d vga -g -d pc_mouse --repeat=mouse -d pc_kbd --repeat=kbd $LAYOUT -c /dev/vcs & + echo $! > /var/run/hurd-console.pid + wait + echo + echo -n "Restarting the Hurd console..." + done & # Switch over envvars="$envvars TERM=hurd" exec < /dev/tty1 > /dev/tty1 2>&1 - echo "Console started, initializing installer environment, please wait..." + echo "Console started" # Set the console device used by /sbin/reopen-console echo /dev/tty1 >/var/run/console-device |