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

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index f7c4d65..658e44a 100755
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -61,39 +61,53 @@ 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/keyboard ]
 	then
-		chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"${cslayout}\"/" \
-		/etc/default/console-setup
+		# squeeze
+		KEYBOARD_FILE="/etc/default/keyboard"
+	elif [ -f /root/etc/default/console-setup ]
+	then
+		# lenny
+		KEYBOARD_FILE="/etc/default/console-setup"
+	fi
 
-		if [ "${csvariant}" ]
+	if [ -n "/root${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-preseed /root debian-installer/keymap "${kbd}"
 	live-preseed /root kbd-chooser/method "${kbd}"