X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F19keyboard;h=d465698da873322839118fc05e1fab88dee039ac;hb=refs%2Ftags%2Fdebian%2F1.157.3-1;hp=ef91c9007d844873d7c0aff16a08317d4fa441dd;hpb=b15f95e06e40a70ed75c30b31cee89d43ec8196b;p=live-boot-grml.git

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index ef91c90..d465698 100755
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -27,7 +27,7 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Setting up console keyboard..."
+log_begin_msg "Setting up console keyboard"
 
 # live-initramfs script
 
@@ -63,22 +63,22 @@ fi
 
 if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]
 then
-	if [ "$cslayout" ]
+	if [ "${cslayout}" ]
 	then
-		chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"$cslayout\"/" \
+		chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"${cslayout}\"/" \
 		/etc/default/console-setup
 
-		if [ "$csvariant" ]
+		if [ "${csvariant}" ]
 		then
-			chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"$csvariant\"/" \
+			chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"${csvariant}\"/" \
 			/etc/default/console-setup
 		else
 			live-preseed /root console-setup/variantcode '' false
 		fi
 
-		if [ "$csmodel" ]
+		if [ "${csmodel}" ]
 		then
-			chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"$csmodel\"/" \
+			chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"${csmodel}\"/" \
 			/etc/default/console-setup
 		else
 			live-preseed /root console-setup/modelcode '' false
@@ -89,11 +89,15 @@ then
 		live-preseed /root console-setup/modelcode '' false
 	fi
 
+	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
-else
-	chroot /root /usr/sbin/install-keymap $kbd
-	live-preseed /root debian-installer/keymap "$kbd"
-	live-preseed /root kbd-chooser/method "$kbd"
+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}"
 fi
 
 log_end_msg