[SCM] live-initramfs branch, debian, updated. debian/1.177.2-1-25-gd77466b

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit b4b914d2a22a7624cf0582c92135f7feecd18adb
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Apr 30 18:47:11 2010 +0200

    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 at 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 ]

-- 
live-initramfs