diff options
| author | maximilian attems <maks@debian.org> | 2005-10-01 02:33:30 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2005-10-01 02:33:30 +0200 |
| commit | a893fa82665ee472079292eb84a125ef81009124 (patch) | |
| tree | 540886f92c987fa65c7e74a9b4e98459ea554efc /scripts | |
| parent | 14739b596ae27800ae6ce071745cf2da382d73b4 (diff) | |
| download | initramfs-tools-a893fa82665ee472079292eb84a125ef81009124.tar.gz initramfs-tools-a893fa82665ee472079292eb84a125ef81009124.zip | |
apply all the 0.30 upstream changes.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/functions | 19 | ||||
| -rw-r--r-- | scripts/local-premount/suspend | 2 |
2 files changed, 17 insertions, 4 deletions
diff --git a/scripts/functions b/scripts/functions index 148dda7..de2268c 100644 --- a/scripts/functions +++ b/scripts/functions @@ -23,12 +23,18 @@ log_warning_msg() log_begin_msg() { - _log_msg "Begin: $@ ..." + if [ -x /sbin/usplash_write ]; then + /sbin/usplash_write "TEXT $@" + fi + _log_msg "Begin: $@ ..." } log_end_msg() { - _log_msg "Done." + if [ -x /sbin/usplash_write ]; then + /sbin/usplash_write "SUCCESS ok" + fi + _log_msg "Done." } # update_progress() # ToDo: NOP placeholder... what else for usplash? @@ -38,6 +44,9 @@ log_end_msg() panic() { + if [ -x /sbin/usplash_write ]; then + /sbin/usplash_write "QUIT" + fi echo $@ FS1='(initramfs) ' exec /bin/sh </dev/console >/dev/console 2>&1 } @@ -228,8 +237,12 @@ load_modules() i2o_boot_events + # FIXME - need to start LVM here + + udevstart + if [ -e /sys/power/resume ]; then - if [ -e ${resume} ]; then + if [ -e "${resume}" ]; then major=$((0x$(stat -c%t ${resume}))) minor=$((0x$(stat -c%T ${resume}))) echo ${major}:${minor} >/sys/power/resume diff --git a/scripts/local-premount/suspend b/scripts/local-premount/suspend index 5791123..6aab596 100644 --- a/scripts/local-premount/suspend +++ b/scripts/local-premount/suspend @@ -19,7 +19,7 @@ if [ "x${resume}" = "x" ]; then exit fi -if [ ! -e ${resume} ]; then +if [ ! -e "${resume}" ]; then exit fi |