From 7c5923bbc4ec57eb144b773c0abc8711ffda292a Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Mon, 12 Dec 2005 11:21:27 +0100
Subject: merge ubuntu modprobe silence stuff and cp all /etc/modprobe.d :)

---
 scripts/local | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'scripts/local')

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
-- 
cgit v1.2.3