diff options
| author | Ben Armstrong <synrg@debian.org> | 2010-01-22 10:03:23 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:07 +0100 |
| commit | 78f812de87f2bde7b83d9b87977a7e4cc6c29aa6 (patch) | |
| tree | bbd2c5ab28daf8815def18ee6439fc593e9d0f98 /scripts/live-bottom | |
| parent | a2876e705ad31d248118454ce9d7bfc5c2eda849 (diff) | |
| download | live-boot-78f812de87f2bde7b83d9b87977a7e4cc6c29aa6.tar.gz live-boot-78f812de87f2bde7b83d9b87977a7e4cc6c29aa6.zip | |
Correcting keyboard handling for squeeze.
Diffstat (limited to 'scripts/live-bottom')
| -rwxr-xr-x | scripts/live-bottom/19keyboard | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard index 1df83fb..658e44a 100755 --- a/scripts/live-bottom/19keyboard +++ b/scripts/live-bottom/19keyboard @@ -63,17 +63,17 @@ fi if [ -x /root/bin/setupcon ] then - if [ -f /root/etc/default/console-setup ] - then - # lenny - KEYBOARD_FILE="/root/etc/default/console-setup" - elif [ -f /root/etc/default/keyboard ] + if [ -f /root/etc/default/keyboard ] then # squeeze - KEYBOARD_FILE="/root/etc/default/keyboard" + KEYBOARD_FILE="/etc/default/keyboard" + elif [ -f /root/etc/default/console-setup ] + then + # lenny + KEYBOARD_FILE="/etc/default/console-setup" fi - if [ -n "${KEYBOARD_FILE}" ] + if [ -n "/root${KEYBOARD_FILE}" ] then if [ "${cslayout}" ] then |