summaryrefslogtreecommitdiff
path: root/scripts/live-bottom
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-04-30 18:47:11 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:08 +0100
commit2590556a825d10f48ca3d4443b41156bb019c9af (patch)
tree9e2fce0bcb2841772a8bb0528cd805bfb6e19a43 /scripts/live-bottom
parent58ca66342e48713c51d0390f754c2d186561681f (diff)
downloadlive-boot-2590556a825d10f48ca3d4443b41156bb019c9af.tar.gz
live-boot-2590556a825d10f48ca3d4443b41156bb019c9af.zip
Merging casper 1.196.
Diffstat (limited to 'scripts/live-bottom')
-rwxr-xr-xscripts/live-bottom/19keyboard4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index 52a6a58..f903f2b 100755
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -107,6 +107,10 @@ then
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 ]