X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=60a2c334cd01be76ebfe14d29c70b480e69d1c81;hb=be861fe1338938e427c3bd8864f5ce744c24c2f3;hp=8be3942c94e599b73f2f8042e5b10630e3823c3b;hpb=26844fbeb8a039ca5f368bc35e67ccd6a7d3b7ab;p=live-boot-grml.git

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