projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.179.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
19keyboard
diff --git
a/scripts/live-bottom/19keyboard
b/scripts/live-bottom/19keyboard
index
1df83fb
..
52a6a58
100755
(executable)
--- a/
scripts/live-bottom/19keyboard
+++ b/
scripts/live-bottom/19keyboard
@@
-63,17
+63,17
@@
fi
if [ -x /root/bin/setupcon ]
then
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
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
fi
- if [ -n "${KEYBOARD_FILE}" ]
+ if [ -n "
/root
${KEYBOARD_FILE}" ]
then
if [ "${cslayout}" ]
then
then
if [ "${cslayout}" ]
then
@@
-104,7
+104,10
@@
then
live-preseed /root console-setup/optionscode '' false
live-preseed /root console-setup/codesetcode '' false
live-preseed /root console-setup/optionscode '' false
live-preseed /root console-setup/codesetcode '' false
- sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
+ if [ -f /root/etc/init.d/usplash ]
+ then
+ sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
+ fi
fi
elif [ -e /root/usr/sbin/install-keymap ]
then
fi
elif [ -e /root/usr/sbin/install-keymap ]
then