Adding upstream version 1.157.4.

[live-boot-grml.git] / scripts / live-bottom / 19keyboard

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index 784aa05..d465698 100755 (executable)
--- 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}"