diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-04-30 18:47:11 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:08 +0100 |
| commit | 2590556a825d10f48ca3d4443b41156bb019c9af (patch) | |
| tree | 9e2fce0bcb2841772a8bb0528cd805bfb6e19a43 | |
| parent | 58ca66342e48713c51d0390f754c2d186561681f (diff) | |
| download | live-boot-2590556a825d10f48ca3d4443b41156bb019c9af.tar.gz live-boot-2590556a825d10f48ca3d4443b41156bb019c9af.zip | |
Merging casper 1.196.
| -rw-r--r-- | docs/ChangeLog.casper | 7 | ||||
| -rwxr-xr-x | scripts/live-bottom/19keyboard | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 18bf8c0..82b667b 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,10 @@ +casper (1.196) karmic; urgency=low + + * Extend our hack that arranges to run setupcon after usplash exits to + cover the new Upstartified usplash as well. + + -- Colin Watson <cjwatson@ubuntu.com> Tue, 29 Sep 2009 01:36:55 +0100 + casper (1.195) karmic; urgency=low [ Oliver Grawert ] 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 ] |