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

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