[SCM] live-initramfs branch, master, updated. 1.157.4-1-36-ge2c44af

[Daniel Baumann]

The following commit has been merged in the master branch:
commit e2c44afd36dea3eb8e3208ffa6837618e8a8e4b4
Author: Ben Armstrong <synrg at debian.org>
Date:   Fri Jan 22 10:03:23 2010 +0100

    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

-- 
live-initramfs