X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F19keyboard;h=31cdfaae692b0ecff7497daf87eedccc8463e969;hb=3d52fbcb4fe70132ade14759d76573b471294800;hp=d43e329c0481e247262bd153f17460033d7260e7;hpb=9fc9e2a1a11b0edada38cb501fefe4f58aa414ac;p=live-boot-grml.git

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index d43e329..31cdfaa 100755
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -20,27 +20,29 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-kbd=us
+kbd=
 cslayout=
 csvariant=
 csmodel=
 
-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
+# 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
 
 if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
         if [ "$cslayout" ]; then
@@ -66,5 +68,6 @@ if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
 else
         chroot /root /usr/sbin/install-keymap $kbd
         live-preseed /root debian-installer/keymap "$kbd"
+	live-preseed /root kbd-chooser/method "$kbd"
 fi
 log_end_msg