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

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index 974b847..5a262fa 100755
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -18,13 +18,18 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
+
+if [ -n "${NOCONSOLEKEYBOARD}" ]
+then
+	exit 0
+fi
 
 . /scripts/live-functions
 
-log_begin_msg "Setting up console keyboard..."
+log_begin_msg "Setting up console keyboard"
 
-# live-initramfs script
+# live-boot script
 
 kbd=
 cslayout=
@@ -32,50 +37,87 @@ 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
-
-	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"
+if [ -x /root/bin/setupcon ]
+then
+	if [ -f /root/etc/default/keyboard ]
+	then
+		# squeeze
+		KEYBOARD_FILE="/etc/default/keyboard"
+	elif [ -f /root/etc/default/console-setup ]
+	then
+		# lenny
+		KEYBOARD_FILE="/etc/default/console-setup"
+	fi
+
+	if [ -n "/root${KEYBOARD_FILE}" ]
+	then
+		if [ "${cslayout}" ]
+		then
+			chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"${cslayout}\"/" \
+			${KEYBOARD_FILE}
+
+			if [ "${csvariant}" ]
+			then
+				chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"${csvariant}\"/" \
+				${KEYBOARD_FILE}
+			else
+				live-preseed /root console-setup/variantcode '' false
+			fi
+
+			if [ "${csmodel}" ]
+			then
+				chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"${csmodel}\"/" \
+				${KEYBOARD_FILE}
+			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
+
+		live-preseed /root console-setup/optionscode '' false
+		live-preseed /root console-setup/codesetcode '' false
+
+		if [ -f /root/etc/init.d/usplash ]
+		then
+			sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
+		elif [ -f /root/etc/init/usplash.conf ]
+		then
+			sed -i '/^post-stop script/a\
+    setupcon' /root/etc/init/usplash.conf
+		fi
+	fi
+elif [ -e /root/usr/sbin/install-keymap ]
+then
+	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