--- mkinitrd-5.0.17/mkinitrd.ark	2008-03-11 11:43:02.000000000 +0000
+++ mkinitrd-5.0.17/mkinitrd	2008-03-11 11:47:43.000000000 +0000
@@ -608,18 +608,6 @@
   fi
 fi
 
-if [ -n "$needusb" -a "x$PROBE" == "xyes" ]; then
-    drivers=$(awk '/^alias[[:space:]]+usb-controller[0-9]*[[:space:]]+/ { print $3}' < $modulefile)
-    if [ -n "$drivers" ]; then
-	for driver in $drivers; do
-	    findmodule $driver
-	done
-	findmodule scsi_mod
-	findmodule sd_mod
-	findmodule usb-storage
-    fi
-fi
-
 if [ -n "$forcescsi" -o -z "$noscsi" -a "x$PROBE" == "xyes" ]; then
     if [ ! -f $modulefile ]; then
         modulefile=/etc/modprobe.conf
@@ -678,6 +666,18 @@
     fi
 fi
 
+if [ -n "$needusb" -a "x$PROBE" == "xyes" ]; then
+    drivers=$(awk '/^alias[[:space:]]+usb-controller[0-9]*[[:space:]]+/ { print $3}' < $modulefile)
+    if [ -n "$drivers" ]; then
+	for driver in $drivers; do
+	    findmodule $driver
+	done
+	findmodule scsi_mod
+	findmodule sd_mod
+	findmodule usb-storage
+    fi
+fi
+
 FBMOD=""
 FBPARM=""
 if [ -z "$nofb" ]; then
@@ -1031,6 +1031,10 @@
 
     options=`sed -n -e "s/^options[ 	][ 	]*$module[ 	][ 	]*//p" $modulefile 2>/dev/null`
 
+    if [ "$module" = "usb-storage" ]; then
+        emit "if nousb nousb"
+    fi
+
     if [ -n "$options" ]; then
         vecho "Adding module $module$text with options $options"
     else
@@ -1056,6 +1060,9 @@
 EOF
         done
     fi
+    if [ "$module" = "usb-storage" ]; then
+        emit "nousb:"
+    fi
 done
 
 if [ -n "$vg_list" ]; then