merge ubuntu modprobe silence stuff

and cp all /etc/modprobe.d :)

7 files changed, 10 insertions, 17 deletions

diff --git a/scripts/functions b/scripts/functions
index cde870d..da77542 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -170,7 +170,7 @@ load_modules()
 			then
 				continue;
 			else
-				modprobe -q $m
+				modprobe -Qb $m
 			fi
 		done
 	fi
diff --git a/scripts/init-premount/thermal b/scripts/init-premount/thermal
index e0d79c3..64858af 100755
--- a/scripts/init-premount/thermal
+++ b/scripts/init-premount/thermal
@@ -16,8 +16,8 @@ prereqs)
 esac
 
 # For ACPI systems
-modprobe -q fan
-modprobe -q thermal
+modprobe -Qb fan
+modprobe -Qb thermal
 
 # For ppc64 systems
-modprobe -q therm_pm72
+modprobe -Qb therm_pm72
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
diff --git a/scripts/local-top/evms b/scripts/local-top/evms
index 46fca5d..563a9ae 100755
--- a/scripts/local-top/evms
+++ b/scripts/local-top/evms
@@ -26,7 +26,7 @@ esac
 unset evms
 	
 for module in dm-mod linear raid0 raid1 raid10 raid5 raid6; do
-	modprobe -q $module
+	modprobe -Qb $module
 done
 
 /sbin/evms_activate
diff --git a/scripts/local-top/lvm b/scripts/local-top/lvm
index 9f608af..40c4e9b 100755
--- a/scripts/local-top/lvm
+++ b/scripts/local-top/lvm
@@ -26,7 +26,7 @@ case ${vg} in
 		;;
 esac
 	
-modprobe -q dm-mod
+modprobe -Qb dm-mod
 
 vgchange -ay
 
diff --git a/scripts/local-top/md b/scripts/local-top/md
index c7515fe..4132159 100755
--- a/scripts/local-top/md
+++ b/scripts/local-top/md
@@ -25,7 +25,7 @@ for x in /dev/hd[a-z][0-9]* /dev/sd[a-z][0-9]*; do
 	fi
 	raidlvl=$(mdadm --examine ${x} 2>/dev/null | grep "Level" | sed -e 's/.*Raid Level : \(.*\)/\1/')
 	if [ "$raidlvl" ]; then
-		modprobe -q ${raidlvl} 2>/dev/null
+		modprobe -Qb ${raidlvl} 2>/dev/null
 		gotraid=y
 	fi
 done
diff --git a/scripts/nfs b/scripts/nfs
index a2f6c3e..0205047 100644
--- a/scripts/nfs
+++ b/scripts/nfs
@@ -9,9 +9,9 @@ mountroot ()
 	run_scripts /scripts/nfs-top
 	[ "$quiet" != "y" ] && log_end_msg
 
-	modprobe nfs
+	modprobe -Qb nfs
 	# For DHCP
-	modprobe af_packet
+	modprobe -Qb af_packet
 
 	ipconfig ${DEVICE}
 	. /tmp/net-${DEVICE}.conf