[SCM] live-boot branch, debian-next, updated. debian/3.0_a4-1-6-g67ee731

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit e55dcbe7253da7f62a3fcb569ae7e34d4adb52ed
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Sep 6 13:55:52 2010 +0200

    Removing usplash support from initscript, usplash is dead.

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 12d0f94..548abca 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -134,7 +134,7 @@ do_stop ()
 		prompt=
 	fi
 
-	for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth /sbin/usplash_write
+	for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth
 	do
 		cache_path "${path}"
 	done
@@ -185,13 +185,6 @@ do_stop ()
 
 			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
-
 			read x < /dev/console
 		fi
 	fi

-- 
live-boot