X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F19keyboard;h=52a6a584af673b42e4de4b3de88822b13d386060;hb=d951dd4cb6eab8a83a4cc4ad52a09a9f58a74a06;hp=1df83fb2effd10e6031d8c2de154eb058072b53f;hpb=c3338cfcfe630510e330f69af9c8b072e4af9af5;p=live-boot-grml.git

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index 1df83fb..52a6a58 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
@@ -104,7 +104,10 @@ then
 		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