X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F19keyboard;h=974b847890d0e84ebb8dc4f63f7a2214089a88ca;hb=526a7c2e15a71dbaef918007637973c3b61986fa;hp=d43e329c0481e247262bd153f17460033d7260e7;hpb=d70b77f919f85511936645abb95d710b80c10c74;p=live-boot-grml.git

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index d43e329..974b847 100755
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -1,46 +1,54 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Setting up console keyboard..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Setting up console keyboard..."
+
+# live-initramfs script
 
-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
@@ -63,8 +71,11 @@ if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
                 live-preseed /root console-setup/variantcode '' false
                 live-preseed /root console-setup/modelcode '' false
         fi
+
+	sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
 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