Fix handling of doslowusb/noslowusb

Set DO_slowusb as default, and make setup_slowusb unset it if it cannot find
a usb-storage attached. This makes genkernel ramdisk adhere to "noslowusb",
makes the ramdisk only wait if there is a usb-storage attached and should fix
gentoo bug #359619.

3 files changed, 14 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ed477d2..e4127a22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,13 @@
 # Distributed under the GPL v2
 # $Id$
 
+  22 Mar 2011; Peter Hjalmarsson <xake@rymdraket.net> defaults/initrd.defaults,
+  defaults/initrd.scripts:
+  Set DO_slowusb as default, and make setup_slowusb unset it if it cannot find
+  a usb-storage attached. This makes genkernel ramdisk adhere to "noslowusb",
+  makes the ramdisk only wait if there is a usb-storage attached and should fix
+  gentoo bug #359619.
+
   16 Mar 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.14
 
diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 14a403ff..fd6d9fc7 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -80,4 +80,4 @@ DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024"
 # Only sections that are in by default or those that
 # are not module groups need to be defined here...
 HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb evms lvm dmraid mdadm fs net'
-MY_HWOPTS='modules pata sata scsi usb firewire waitscan dmraid mdadm fs net iscsi'
+MY_HWOPTS='modules pata sata scsi slowusb usb firewire waitscan dmraid mdadm fs net iscsi'
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 10fdb137..4a12b73e 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -419,11 +419,12 @@ setup_hotplug() {
 }
 
 setup_slowusb() {
-	# slowusb already set?
-	if [ "${DO_slowusb}" = "1" ]
-	then
-		return
-	fi
+	# This function removes unset DO_slowusb if there is no usb-storage attached.
+	# If noslowusb is set, skip this function
+	[ "${DO_slowusb}" ] || return
+
+	# Unset DO_slowusb, so we can set it again if usb-storage has something attached
+	unset DO_slowusb
 
 	local usb_storage_dir="/sys/bus/usb/drivers/usb-storage"
 	if [ ! -d "${usb_storage_dir}" ]