X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F19keyboard;h=5a262fad0f7e38709e75e7566a2c29411501ec0c;hb=5e1fc3b98b6346a087772c68f21fd56c7bf6aa42;hp=1df83fb2effd10e6031d8c2de154eb058072b53f;hpb=108b84438ca88be2cf02cb2abe786a0213c40b2c;p=live-boot-grml.git

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index 1df83fb..5a262fa 100755
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -18,7 +18,7 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 if [ -n "${NOCONSOLEKEYBOARD}" ]
 then
@@ -29,7 +29,7 @@ fi
 
 log_begin_msg "Setting up console keyboard"
 
-# live-initramfs script
+# live-boot script
 
 kbd=
 cslayout=
@@ -63,17 +63,17 @@ fi
 
 if [ -x /root/bin/setupcon ]
 then
-	if [ -f /root/etc/default/console-setup ]
-	then
-		# lenny
-		KEYBOARD_FILE="/root/etc/default/console-setup"
-	elif [ -f /root/etc/default/keyboard ]
+	if [ -f /root/etc/default/keyboard ]
 	then
 		# squeeze
-		KEYBOARD_FILE="/root/etc/default/keyboard"
+		KEYBOARD_FILE="/etc/default/keyboard"
+	elif [ -f /root/etc/default/console-setup ]
+	then
+		# lenny
+		KEYBOARD_FILE="/etc/default/console-setup"
 	fi
 
-	if [ -n "${KEYBOARD_FILE}" ]
+	if [ -n "/root${KEYBOARD_FILE}" ]
 	then
 		if [ "${cslayout}" ]
 		then
@@ -104,7 +104,14 @@ then
 		live-preseed /root console-setup/optionscode '' false
 		live-preseed /root console-setup/codesetcode '' false
 
-		sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
+		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