diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-09-06 15:16:07 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:59:20 +0100 |
| commit | c5305153dc3aadf2e2cbcb05ca8cfbc1624d4102 (patch) | |
| tree | 7ed5eb63d10ae9ca0d3d9a93a81d37a7d55bdf4b | |
| parent | 534e523be9e50f3a9dff2b52bf119383dfacaa4f (diff) | |
| download | live-boot-c5305153dc3aadf2e2cbcb05ca8cfbc1624d4102.tar.gz live-boot-c5305153dc3aadf2e2cbcb05ca8cfbc1624d4102.zip | |
Removing usplash support in initramfs, usplash is dead.
| -rw-r--r-- | debian/live-boot.bug-script | 2 | ||||
| -rwxr-xr-x | scripts/live | 23 | ||||
| -rw-r--r-- | scripts/live-functions | 8 |
3 files changed, 2 insertions, 31 deletions
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 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 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" } |