summaryrefslogtreecommitdiff
path: root/scripts/local
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2005-12-12 11:21:27 +0100
committermaximilian attems <maks@debian.org>2005-12-12 11:21:27 +0100
commit7c5923bbc4ec57eb144b773c0abc8711ffda292a (patch)
tree7ad76117beb41c4a09a2e0bb3b53bcd94348b11f /scripts/local
parentedfcf7ea648bc07435064df4d8c603db7d26aa56 (diff)
downloadinitramfs-tools-7c5923bbc4ec57eb144b773c0abc8711ffda292a.tar.gz
initramfs-tools-7c5923bbc4ec57eb144b773c0abc8711ffda292a.zip
merge ubuntu modprobe silence stuff
and cp all /etc/modprobe.d :)
Diffstat (limited to 'scripts/local')
-rw-r--r--scripts/local9
1 files changed, 1 insertions, 8 deletions
diff --git a/scripts/local b/scripts/local
index df09298..6c08f39 100644
--- a/scripts/local
+++ b/scripts/local
@@ -7,13 +7,6 @@ mountroot ()
run_scripts /scripts/local-top
[ "$quiet" != "y" ] && log_end_msg
- # Wait for SCSI/USB/etc. devices for a bit
- slumber=10
- while [ ${slumber} -gt 0 -a ! -e "${ROOT}" ]; do
- /bin/sleep 1
- slumber=$(( ${slumber} - 1 ))
- done
-
# Get the root filesystem type
while [ ! -e "${ROOT}" ]; do
panic "ALERT! ${ROOT} does not exist. Dropping to a shell!"
@@ -32,7 +25,7 @@ mountroot ()
fi
# FIXME This has no error checking
- modprobe ${FSTYPE}
+ modprobe -Qb ${FSTYPE}
# FIXME This has no error checking
# Mount root