X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F19keyboard;h=40834d8dc7abf2a8960f87605e872348f796d2cc;hb=beec4f9fb766be23d575b070e398639d5a4a9c9d;hp=7acc4e4595d19f78ee54f91cc94d9868a0fb00c5;hpb=269ea83c30e08ac2f82cea67b5d6ac065a67cbef;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/19keyboard b/scripts/casper-bottom/19keyboard
index 7acc4e4..40834d8 100755
--- a/scripts/casper-bottom/19keyboard
+++ b/scripts/casper-bottom/19keyboard
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PREREQ=""
-DESCRIPTION="Setting up keyboard..."
+DESCRIPTION="Setting up console keyboard..."
 
 . /scripts/casper-functions
 
@@ -20,23 +20,28 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-kbd=us
+kbd=
 cslayout=
 csvariant=
 csmodel=
 
 # commandline
-if [ ! -z "${KBD}" ]; then
+if [ -n "${KBD}" ]; then
     kbd="${KBD}"
+else
+    kbd=us
 fi
-if [ ! -z "${CSLAYOUT}" ]; then
-    cslayout="${CSLAYOUT}"
+
+really_export kbd
+
+if [ -n "${KLAYOUT}" ]; then
+    cslayout="${KLAYOUT}"
 fi
-if [ ! -z "${CSVARIANT}" ]; then
-    csvariant="${CSVARIANT}"
+if [ -n "${KVARIANT}" ]; then
+    csvariant="${KVARIANT}"
 fi
-if [ ! -z "${CSMODEL}" ]; then
-    csmodel="${CSMODEL}"
+if [ -n "${KMODEL}" ]; then
+    csmodel="${KMODEL}"
 fi
 
 if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
@@ -63,5 +68,6 @@ if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
 else
         chroot /root /usr/sbin/install-keymap $kbd
         casper-preseed /root debian-installer/keymap "$kbd"
+        casper-preseed /root kbd-chooser/method "$kbd"
 fi
 log_end_msg