diff options
| author | maximilian attems <max@stro.at> | 2010-10-19 19:03:50 +0200 |
|---|---|---|
| committer | maximilian attems <max@stro.at> | 2011-02-23 18:08:53 +0100 |
| commit | 6cab0eccd015a443157c83643ec5aff9505bdc23 (patch) | |
| tree | 4f74f1116789818b2491d6200350fc2b58edd145 | |
| parent | f5b834764bd000680ffca2f86625a4df6decb4d0 (diff) | |
initramfs-tools: cleanup any usplash traces
usplash is not released in Squeeze and is no longer in Debian unstable.
Thus nuke usplash calls and any ref to it.
Signed-off-by: maximilian attems <max@stro.at>
Reviewed-by: Michael Prokop <mika@debian.org>
| -rwxr-xr-x | init | 2 | ||||
| -rw-r--r-- | scripts/functions | 10 | ||||
| -rw-r--r-- | scripts/local | 7 |
3 files changed, 1 insertions, 18 deletions
@@ -197,7 +197,7 @@ fi maybe_break top -# Don't do log messages here to avoid confusing usplash +# Don't do log messages here to avoid confusing graphical boots run_scripts /scripts/init-top maybe_break modules diff --git a/scripts/functions b/scripts/functions index dff1052..2280ba2 100644 --- a/scripts/functions +++ b/scripts/functions @@ -23,26 +23,16 @@ log_warning_msg() log_begin_msg() { - if [ -x /sbin/usplash_write ]; then - /sbin/usplash_write "TEXT $@" - fi _log_msg "Begin: $@ ... " } log_end_msg() { - if [ -x /sbin/usplash_write ]; then - /sbin/usplash_write "SUCCESS ok" - fi _log_msg "done.\n" } panic() { - if [ -x /sbin/usplash_write ]; then - /sbin/usplash_write "QUIT" - fi - if command -v chvt >/dev/null 2>&1; then chvt 1 fi diff --git a/scripts/local b/scripts/local index 8cb279a..521e69a 100644 --- a/scripts/local +++ b/scripts/local @@ -29,10 +29,6 @@ pre_mountroot() # Default delay is 30s slumber=${ROOTDELAY:-30} - if [ -x /sbin/usplash_write ]; then - /sbin/usplash_write "TIMEOUT ${slumber}" || true - fi - slumber=$(( ${slumber} * 10 )) while [ ! -e "${ROOT}" ] \ || ! $(get_fstype "${ROOT}" >/dev/null); do @@ -46,9 +42,6 @@ pre_mountroot() else log_end_msg 1 || true fi - if [ -x /sbin/usplash_write ]; then - /sbin/usplash_write "TIMEOUT 15" || true - fi fi # We've given up, but we'll let the user fix matters if they can |