X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F19keyboard;h=5f1d9e72575b1d2e436b7933bcaf213342db26e5;hb=046580edb4877fc1a4a823e882a0949fbc729544;hp=31cdfaae692b0ecff7497daf87eedccc8463e969;hpb=ea5ccacffb14572b4800d14fc9eea23cad7ca893;p=live-boot-grml.git

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index 31cdfaa..5f1d9e7 100755
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -1,24 +1,35 @@
 #!/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
+
+if [ -n "${NOCONSOLEKEYBOARD}" ]
+then
+	exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Setting up console keyboard"
+
+# live-initramfs script
 
 kbd=
 cslayout=
@@ -26,48 +37,63 @@ csvariant=
 csmodel=
 
 # commandline
-if [ -n "${KBD}" ]; then
-    kbd="${KBD}"
+if [ -n "${KBD}" ]
+then
+	kbd="${KBD}"
 else
-    kbd=us
+	kbd=us
 fi
 
 really_export kbd
 
-if [ -n "${KLAYOUT}" ]; then
-    cslayout="${KLAYOUT}"
+if [ -n "${KLAYOUT}" ]
+then
+	cslayout="${KLAYOUT}"
 fi
-if [ -n "${KVARIANT}" ]; then
-    csvariant="${KVARIANT}"
+
+if [ -n "${KVARIANT}" ]
+then
+	csvariant="${KVARIANT}"
 fi
-if [ -n "${KMODEL}" ]; then
-    csmodel="${KMODEL}"
+
+if [ -n "${KMODEL}" ]
+then
+	csmodel="${KMODEL}"
 fi
 
-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
-                        live-preseed /root console-setup/variantcode '' false
-                fi
-                if [ "$csmodel" ]; then
-                        chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"$csmodel\"/" \
-                                /etc/default/console-setup
-                else
-                        live-preseed /root console-setup/modelcode '' false
-                fi
-        else
-                live-preseed /root console-setup/layoutcode '' false
-                live-preseed /root console-setup/variantcode '' false
-                live-preseed /root console-setup/modelcode '' false
-        fi
+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
+			live-preseed /root console-setup/variantcode '' false
+		fi
+
+		if [ "${csmodel}" ]
+		then
+			chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"${csmodel}\"/" \
+			/etc/default/console-setup
+		else
+			live-preseed /root console-setup/modelcode '' false
+		fi
+	else
+		live-preseed /root console-setup/layoutcode '' false
+		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"
+	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