[SCM] live-boot branch, debian, updated. debian/2.0.4-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit be861fe1338938e427c3bd8864f5ce744c24c2f3
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Sep 6 15:20:32 2010 +0200

    Removing usplash support in initramfs, usplash is dead.

diff --git a/debian/live-boot.bug-script b/debian/live-boot.bug-script
index 4f327b1..1dc3d3b 100644
--- a/debian/live-boot.bug-script
+++ b/debian/live-boot.bug-script
@@ -10,6 +10,6 @@ dpkg -l eject uuid-runtime wget
 dpkg -l loop-aes-utils curlftpfs genext2fs httpfs2 squashfs-tools mtd-tools
 
 # Checking other packages
-dpkg -l cryptsetup splashy usplash
+dpkg -l cryptsetup
 
 exit 0
diff --git a/scripts/live b/scripts/live
index 8be3942..60a2c33 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1626,16 +1626,6 @@ find_livefs ()
 	return 1
 }
 
-set_usplash_timeout ()
-{
-	if [ -x /sbin/usplash_write ]
-	then
-		/sbin/usplash_write "TIMEOUT 120"
-	else if [ -x /sbin/splashy_update ] ; then
-		/sbin/splashy_update "TIMEOUT 120"
-	fi ; fi
-}
-
 integrity_check ()
 {
 	media_mountpoint="${1}"
@@ -1662,14 +1652,6 @@ integrity_check ()
 	fi
 }
 
-start_usplash_pulse ()
-{
-	if [ -x /sbin/usplash_write ]
-	then
-		/sbin/usplash_write "PULSELOGO"
-	fi
-}
-
 mountroot ()
 {
         if [ -x /scripts/local-top/cryptroot ]; then
@@ -1688,9 +1670,6 @@ mountroot ()
 
 	Arguments
 
-	set_usplash_timeout
-	start_usplash_pulse
-
 	maybe_break live-premount
 	log_begin_msg "Running /scripts/live-premount"
 	run_scripts /scripts/live-premount
@@ -1699,8 +1678,6 @@ mountroot ()
 	# Needed here too because some things (*cough* udev *cough*)
 	# changes the timeout
 
-	set_usplash_timeout
-
 	if [ ! -z "${NETBOOT}" ] || [ ! -z "${FETCH}" ] || [ ! -z "${HTTPFS}" ] || [ ! -z "${FTPFS}" ]
 	then
 		if do_netmount
diff --git a/scripts/live-functions b/scripts/live-functions
index b1d7503..5efe432 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -9,13 +9,7 @@ log_wait_msg ()
 	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
-	else if [ -x /sbin/splashy_update ] ; then
-		/sbin/splashy_update "getstring ${@}" | read nunya
-	fi ; fi
+	fi
 
 	_log_msg "Waiting: ${@} ... \n"
 }

-- 
live-boot