X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F19keyboard;h=7acc4e4595d19f78ee54f91cc94d9868a0fb00c5;hb=refs%2Ftags%2Fdebian%2F1.77%2Bdebian-1;hp=895a698c0cef7b066875c51a193e101822660bca;hpb=4a0b1ba4d428c623d14bae7f0db85c80abb0da0a;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/19keyboard b/scripts/casper-bottom/19keyboard
index 895a698..7acc4e4 100755
--- a/scripts/casper-bottom/19keyboard
+++ b/scripts/casper-bottom/19keyboard
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Setting up keyboard..."
 
-. /scripts/functions
+. /scripts/casper-functions
 
 prereqs()
 {
@@ -21,15 +21,47 @@ esac
 log_begin_msg "$DESCRIPTION"
 
 kbd=us
+cslayout=
+csvariant=
+csmodel=
 
-for x in $(cat /proc/cmdline); do
-                case $x in
-                        kbd-chooser/method=*)
-                                kbd=${x#kbd-chooser/method=}
-                                ;;
-                esac
-done
+# commandline
+if [ ! -z "${KBD}" ]; then
+    kbd="${KBD}"
+fi
+if [ ! -z "${CSLAYOUT}" ]; then
+    cslayout="${CSLAYOUT}"
+fi
+if [ ! -z "${CSVARIANT}" ]; then
+    csvariant="${CSVARIANT}"
+fi
+if [ ! -z "${CSMODEL}" ]; then
+    csmodel="${CSMODEL}"
+fi
 
-chroot /root /usr/sbin/install-keymap $kbd
-casper-preseed /root debian-installer/keymap "$kbd"
+if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
+        if [ "$cslayout" ]; then
+                chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"$cslayout\"/" \
+                        /etc/default/console-setup
+                if [ "$csvariant" ]; then
+                        chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"$csvariant\"/" \
+                                /etc/default/console-setup
+                else
+                        casper-preseed /root console-setup/variantcode '' false
+                fi
+                if [ "$csmodel" ]; then
+                        chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"$csmodel\"/" \
+                                /etc/default/console-setup
+                else
+                        casper-preseed /root console-setup/modelcode '' false
+                fi
+        else
+                casper-preseed /root console-setup/layoutcode '' false
+                casper-preseed /root console-setup/variantcode '' false
+                casper-preseed /root console-setup/modelcode '' false
+        fi
+else
+        chroot /root /usr/sbin/install-keymap $kbd
+        casper-preseed /root debian-installer/keymap "$kbd"
+fi
 log_end_msg