X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F19keyboard;h=ef901152cd8d30bd2f27ab7542b95193abbf6984;hb=4bdaa2237c6ae923d1dd068e9024ebceca3f40d9;hp=40834d8dc7abf2a8960f87605e872348f796d2cc;hpb=c972c6eea545add125883eaaeea459551e54589c;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/19keyboard b/scripts/casper-bottom/19keyboard
index 40834d8..ef90115 100755
--- a/scripts/casper-bottom/19keyboard
+++ b/scripts/casper-bottom/19keyboard
@@ -20,29 +20,27 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-kbd=
+kbd=us
 cslayout=
 csvariant=
 csmodel=
 
-# commandline
-if [ -n "${KBD}" ]; then
-    kbd="${KBD}"
-else
-    kbd=us
-fi
-
-really_export kbd
-
-if [ -n "${KLAYOUT}" ]; then
-    cslayout="${KLAYOUT}"
-fi
-if [ -n "${KVARIANT}" ]; then
-    csvariant="${KVARIANT}"
-fi
-if [ -n "${KMODEL}" ]; then
-    csmodel="${KMODEL}"
-fi
+for x in $(cat /proc/cmdline); do
+        case $x in
+                kbd-chooser/method=*)
+                        kbd=${x#kbd-chooser/method=}
+                        ;;
+                console-setup/layoutcode=*)
+                        cslayout=${x#console-setup/layoutcode=}
+                        ;;
+                console-setup/variantcode=*)
+                        csvariant=${x#console-setup/variantcode=}
+                        ;;
+                console-setup/modelcode=*)
+                        csmodel=${x#console-setup/modelcode=}
+                        ;;
+        esac
+done
 
 if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
         if [ "$cslayout" ]; then
@@ -68,6 +66,5 @@ 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