[SCM] live-boot branch, debian-old-2.0, updated. debian/2.0.3-1-8-g1c33576

Daniel Baumann daniel at debian.org
Mon Sep 6 13:26:23 UTC 2010


The following commit has been merged in the debian-old-2.0 branch:
commit 26844fbeb8a039ca5f368bc35e67ccd6a7d3b7ab
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



More information about the debian-live-changes mailing list