X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F19keyboard;h=d465698da873322839118fc05e1fab88dee039ac;hb=dc3fbe9cdabb2cbc257b0911dbbc91624c8ae5ac;hp=784aa05a80c8625848ef241d6092dca5e13226af;hpb=cc62ca76356dc851006e3fc980cc1dcc46ef9ca6;p=live-boot-grml.git

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index 784aa05..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
 
@@ -89,8 +89,12 @@ 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
+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}"