From: Daniel Baumann <daniel@debian.org>
Date: Fri, 30 Apr 2010 16:47:11 +0000 (+0200)
Subject: Merging casper 1.196.
X-Git-Tag: debian/2.0.15-1~170
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=2590556a825d10f48ca3d4443b41156bb019c9af

Merging casper 1.196.
---

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 ]