[SCM] Debian Live initramfs hook branch, master, updated. 1.139.1-4-19-g422e591

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 422e5916382070c5b32ac7a4c11e5794f0f7bda8
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Nov 23 20:28:55 2008 +0100

    Also using splashy in shutdown message of the initscript.

diff --git a/debian/init b/debian/init
index 149314b..62f5378 100644
--- a/debian/init
+++ b/debian/init
@@ -99,11 +99,19 @@ do_stop ()
 	stty sane < /dev/console
 
 	# XXX - i18n
-	echo "Please remove the disc and close the tray (if any) then press ENTER: " > /dev/console
-	if [ -x /sbin/usplash_write ]; then
-	    /sbin/usplash_write "TIMEOUT 86400"
-	    /sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)"
-	    /sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
+	remove_msg="Please remove the disc and close the tray (if any) then press ENTER"
+	echo $remove_msg ": " > /dev/console
+
+	if [ -x /sbin/usplash_write ]
+	then
+		/sbin/usplash_write "TIMEOUT 86400"
+		/sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)"
+		/sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
+	elif [ -x /sbin/splashy_update ]
+	then
+		# Reading from console does not work while splashy is active
+		/sbin/splashy_update "TIMEOUT 86400"
+		/sbin/splashy_update "getstring ${remove_msg}" > /dev/null || read x < /dev/console
 	fi
 
 	read x < /dev/console

-- 
Debian Live initramfs hook