X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F19keyboard;h=f903f2b722500a690a108f63395ac2c607618c27;hb=f32a0232042e7579d78c1646d93fd68eec62aaa2;hp=784aa05a80c8625848ef241d6092dca5e13226af;hpb=cc62ca76356dc851006e3fc980cc1dcc46ef9ca6;p=live-boot-grml.git

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index 784aa05..f903f2b 100755
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -27,7 +27,7 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Setting up console keyboard..."
+log_begin_msg "Setting up console keyboard"
 
 # live-initramfs script
 
@@ -61,36 +61,60 @@ then
 	csmodel="${KMODEL}"
 fi
 
-if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]
+if [ -x /root/bin/setupcon ]
 then
-	if [ "${cslayout}" ]
+	if [ -f /root/etc/default/keyboard ]
 	then
-		chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"${cslayout}\"/" \
-		/etc/default/console-setup
+		# squeeze
+		KEYBOARD_FILE="/etc/default/keyboard"
+	elif [ -f /root/etc/default/console-setup ]
+	then
+		# lenny
+		KEYBOARD_FILE="/etc/default/console-setup"
+	fi
 
-		if [ "${csvariant}" ]
+	if [ -n "/root${KEYBOARD_FILE}" ]
+	then
+		if [ "${cslayout}" ]
 		then
-			chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"${csvariant}\"/" \
-			/etc/default/console-setup
+			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
 
-		if [ "${csmodel}" ]
+		live-preseed /root console-setup/optionscode '' false
+		live-preseed /root console-setup/codesetcode '' false
+
+		if [ -f /root/etc/init.d/usplash ]
 		then
-			chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"${csmodel}\"/" \
-			/etc/default/console-setup
-		else
-			live-preseed /root console-setup/modelcode '' false
+			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
-	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
+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}"