From 2590556a825d10f48ca3d4443b41156bb019c9af Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 30 Apr 2010 18:47:11 +0200 Subject: [PATCH 1/1] Merging casper 1.196. --- docs/ChangeLog.casper | 7 +++++++ scripts/live-bottom/19keyboard | 4 ++++ 2 files changed, 11 insertions(+) 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 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 ] -- 2.1.4