[SCM] live-initramfs branch, debian, updated. debian/1.236.1-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 695af4d2b01dcfc199468a8b4104b9b3d40804e9
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat May 1 14:04:49 2010 +0200

    Merging casper 1.227.

diff --git a/debian/live-initramfs.init b/debian/live-initramfs.init
index 92e42b3..da461b5 100644
--- a/debian/live-initramfs.init
+++ b/debian/live-initramfs.init
@@ -176,18 +176,24 @@ do_stop ()
 
 		[ "$prompt" ] || return 0
 
-		stty sane < /dev/console
+		if [ -x /bin/plymouth ] && plymouth --ping
+		then
+			plymouth message --text="${MESSAGE} and press ENTER to continue:"
+			plymouth watch-keystroke > /dev/null
+		else
+			stty sane < /dev/console
 
-		printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
+			printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
 
-		if [ -x /sbin/usplash_write ]
-		then
-			/sbin/usplash_write "TIMEOUT 86400"
-			/sbin/usplash_write "TEXT-URGENT ${MESSAGE}"
-			/sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
-		fi
+			if [ -x /sbin/usplash_write ]
+			then
+				/sbin/usplash_write "TIMEOUT 86400"
+				/sbin/usplash_write "TEXT-URGENT ${MESSAGE}"
+				/sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
+			fi
 
-		read x < /dev/console
+			read x < /dev/console
+		fi
 	fi
 }
 
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 7a5ba08..a483397 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,10 @@
+casper (1.227) lucid; urgency=low
+
+  * casper-md5check: port from usplash to plymouth.  LP: #500198
+  * fix up our reliance on usplash, /dev/console elsewhere.  LP: #506418.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Fri, 12 Mar 2010 01:12:28 -0800
+
 casper (1.226) lucid; urgency=low
 
   [ Colin Watson ]
diff --git a/scripts/live-functions b/scripts/live-functions
index 4c37f4b..9e138ec 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -5,7 +5,11 @@
 log_wait_msg ()
 {
 	# Print a message and wait for enter
-	if [ -x /sbin/usplash_write ]
+	if [ -x /bin/plymouth ] && plymouth --ping
+	then
+		plymouth message --text="$@"
+		plymouth watch-keystroke | read nunya
+	elif [ -x /sbin/usplash_write ]
 	then
 		/sbin/usplash_write "INPUTENTER ${@}"
 		read nunya < /dev/.initramfs/usplash_outfifo

-- 
live-initramfs