summaryrefslogtreecommitdiff
path: root/scripts/live
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-09-06 15:16:07 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:59:20 +0100
commitc5305153dc3aadf2e2cbcb05ca8cfbc1624d4102 (patch)
tree7ed5eb63d10ae9ca0d3d9a93a81d37a7d55bdf4b /scripts/live
parent534e523be9e50f3a9dff2b52bf119383dfacaa4f (diff)
downloadlive-boot-c5305153dc3aadf2e2cbcb05ca8cfbc1624d4102.tar.gz
live-boot-c5305153dc3aadf2e2cbcb05ca8cfbc1624d4102.zip
Removing usplash support in initramfs, usplash is dead.
Diffstat (limited to 'scripts/live')
-rwxr-xr-xscripts/live23
1 files changed, 0 insertions, 23 deletions
diff --git a/scripts/live b/scripts/live
index 942a22b..d34279d 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1687,16 +1687,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}"
@@ -1723,14 +1713,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
@@ -1749,9 +1731,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
@@ -1760,8 +1739,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