From: Ben Armstrong <synrg@debian.org>
Date: Fri, 22 Jan 2010 09:03:23 +0000 (+0100)
Subject: Correcting keyboard handling for squeeze.
X-Git-Tag: debian/2.0.15-1~233
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=78f812de87f2bde7b83d9b87977a7e4cc6c29aa6;p=live-boot-grml.git

Correcting keyboard handling for squeeze.
---

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