Merging casper 1.199.

[live-boot-grml.git] / scripts / live-bottom / 19keyboard

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index 658e44a..f903f2b 100755 (executable)
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -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