debian's module-init-tools of testing doesn't have yet the

modprobe -Qb interface, keep the change for next time. :(

8 files changed, 12 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index b04358b..1a61807 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ initramfs-tools (0.43) unstable; urgency=high
   * scripts/functions: remove old duplicate suspend support.
 
   * Sync with 0.40ubuntu8. (Closes: #337318)
+    - Revert the modprobe changes for now as modules-init-tools of
+      testing doesn't have yet the wanted interface.
 
  -- maximilian attems <maks@sternwelten.at>  Mon, 12 Dec 2005 11:22:15 +0100
 
diff --git a/scripts/functions b/scripts/functions
index da77542..cde870d 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -170,7 +170,7 @@ load_modules()
 			then
 				continue;
 			else
-				modprobe -Qb $m
+				modprobe -q $m
 			fi
 		done
 	fi
diff --git a/scripts/init-premount/thermal b/scripts/init-premount/thermal
index 64858af..e0d79c3 100755
--- a/scripts/init-premount/thermal
+++ b/scripts/init-premount/thermal
@@ -16,8 +16,8 @@ prereqs)
 esac
 
 # For ACPI systems
-modprobe -Qb fan
-modprobe -Qb thermal
+modprobe -q fan
+modprobe -q thermal
 
 # For ppc64 systems
-modprobe -Qb therm_pm72
+modprobe -q therm_pm72
diff --git a/scripts/local b/scripts/local
index 6c08f39..979f07d 100644
--- a/scripts/local
+++ b/scripts/local
@@ -25,7 +25,7 @@ mountroot ()
 	fi
 
 	# FIXME This has no error checking
-	modprobe -Qb ${FSTYPE}
+	modprobe ${FSTYPE}
 
 	# FIXME This has no error checking
 	# Mount root
diff --git a/scripts/local-top/evms b/scripts/local-top/evms
index 563a9ae..46fca5d 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 -Qb $module
+	modprobe -q $module
 done
 
 /sbin/evms_activate
diff --git a/scripts/local-top/lvm b/scripts/local-top/lvm
index 40c4e9b..9f608af 100755
--- a/scripts/local-top/lvm
+++ b/scripts/local-top/lvm
@@ -26,7 +26,7 @@ case ${vg} in
 		;;
 esac
 	
-modprobe -Qb dm-mod
+modprobe -q dm-mod
 
 vgchange -ay
 
diff --git a/scripts/local-top/md b/scripts/local-top/md
index 4132159..c7515fe 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 -Qb ${raidlvl} 2>/dev/null
+		modprobe -q ${raidlvl} 2>/dev/null
 		gotraid=y
 	fi
 done
diff --git a/scripts/nfs b/scripts/nfs
index 0205047..a2f6c3e 100644
--- a/scripts/nfs
+++ b/scripts/nfs
@@ -9,9 +9,9 @@ mountroot ()
 	run_scripts /scripts/nfs-top
 	[ "$quiet" != "y" ] && log_end_msg
 
-	modprobe -Qb nfs
+	modprobe nfs
 	# For DHCP
-	modprobe -Qb af_packet
+	modprobe af_packet
 
 	ipconfig ${DEVICE}
 	. /tmp/net-${DEVICE}.conf