diff options
| author | maximilian attems <maks@debian.org> | 2010-06-17 11:22:01 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2010-06-17 11:24:07 +0200 |
| commit | eb93a7e7d11da7789fa357c763ce2bc76245c8a8 (patch) | |
| tree | 2ae697d02ab5c6512bbc727329029ffa03f4d6d7 | |
| parent | d53a83994bfe7a9e1b9278afc4a12f7dca610f3f (diff) | |
| download | initramfs-tools-eb93a7e7d11da7789fa357c763ce2bc76245c8a8.tar.gz initramfs-tools-eb93a7e7d11da7789fa357c763ce2bc76245c8a8.zip | |
pre_mountroot(): reduce timeout to 30 seconds
giant disk arrays, clusters will need to provide their own rootdelay=
boot arg, they should have capable admins.
3 minutes wait is just too long for regular users.
sync from ubuntu 0.96.1ubuntu1.
Acked-by: Michael Prokop <mika@debian.org>
Signed-off-by: maximilian attems <maks@debian.org>
| -rw-r--r-- | scripts/local | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/local b/scripts/local index 9b51174..8cb279a 100644 --- a/scripts/local +++ b/scripts/local @@ -26,12 +26,9 @@ pre_mountroot() if [ ! -e "${ROOT}" ] || ! $(get_fstype "${ROOT}" >/dev/null); then log_begin_msg "Waiting for root file system" - # Default delay is 180s - if [ -z "${ROOTDELAY}" ]; then - slumber=180 - else - slumber=${ROOTDELAY} - fi + # Default delay is 30s + slumber=${ROOTDELAY:-30} + if [ -x /sbin/usplash_write ]; then /sbin/usplash_write "TIMEOUT ${slumber}" || true fi |