Adding casper 1.77+debian-5.

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

diff --git a/scripts/casper-bottom/19keyboard b/scripts/casper-bottom/19keyboard
index fc2baf9..40834d8 100755 (executable)
--- 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
 
@@ -34,14 +34,14 @@ fi
 
 really_export kbd
 
-if [ -n "${CSLAYOUT}" ]; then
-    cslayout="${CSLAYOUT}"
+if [ -n "${KLAYOUT}" ]; then
+    cslayout="${KLAYOUT}"
 fi
-if [ -n "${CSVARIANT}" ]; then
-    csvariant="${CSVARIANT}"
+if [ -n "${KVARIANT}" ]; then
+    csvariant="${KVARIANT}"
 fi
-if [ -n "${CSMODEL}" ]; then
-    csmodel="${CSMODEL}"
+if [ -n "${KMODEL}" ]; then
+    csmodel="${KMODEL}"
 fi
 
 if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
@@ -68,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