[SCM] live-initramfs branch, master, updated. 1.157.4-1-30-gcd98ee7

[Daniel Baumann]

The following commit has been merged in the master branch:
commit cd98ee705e1480e55fd51700e19e5feb2f179d48
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Dec 9 19:39:50 2009 +0100

    Updating defaults file of console-setup for squeeze, thanks to Jun NOGATA <nogajun at gmail.com> (Closes: #560187).

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index d465698..1df83fb 100755
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -61,38 +61,51 @@ then
 	csmodel="${KMODEL}"
 fi
 
-if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]
+if [ -x /root/bin/setupcon ]
 then
-	if [ "${cslayout}" ]
+	if [ -f /root/etc/default/console-setup ]
 	then
-		chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"${cslayout}\"/" \
-		/etc/default/console-setup
+		# lenny
+		KEYBOARD_FILE="/root/etc/default/console-setup"
+	elif [ -f /root/etc/default/keyboard ]
+	then
+		# squeeze
+		KEYBOARD_FILE="/root/etc/default/keyboard"
+	fi
 
-		if [ "${csvariant}" ]
+	if [ -n "${KEYBOARD_FILE}" ]
+	then
+		if [ "${cslayout}" ]
 		then
-			chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"${csvariant}\"/" \
-			/etc/default/console-setup
+			chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"${cslayout}\"/" \
+			${KEYBOARD_FILE}
+
+			if [ "${csvariant}" ]
+			then
+				chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"${csvariant}\"/" \
+				${KEYBOARD_FILE}
+			else
+				live-preseed /root console-setup/variantcode '' false
+			fi
+
+			if [ "${csmodel}" ]
+			then
+				chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"${csmodel}\"/" \
+				${KEYBOARD_FILE}
+			else
+				live-preseed /root console-setup/modelcode '' false
+			fi
 		else
+			live-preseed /root console-setup/layoutcode '' false
 			live-preseed /root console-setup/variantcode '' false
-		fi
-
-		if [ "${csmodel}" ]
-		then
-			chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"${csmodel}\"/" \
-			/etc/default/console-setup
-		else
 			live-preseed /root console-setup/modelcode '' false
 		fi
-	else
-		live-preseed /root console-setup/layoutcode '' false
-		live-preseed /root console-setup/variantcode '' false
-		live-preseed /root console-setup/modelcode '' false
-	fi
 
-	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
+		sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
+	fi
 elif [ -e /root/usr/sbin/install-keymap ]
 then
 	chroot /root /usr/sbin/install-keymap ${kbd}

-- 
live-initramfs