2005-05-23 Jeremy Katz <katzj@redhat.com>

	* loader2/modules.c (loadModule): usb-storage has reached new
	levels of awful and now doesn't enumerate the devices with
	anything approaching a reasonable speed.  Add a sleep to wait for
	some devices to show up

2 files changed, 20 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b5b8c709e..0b54ba867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-05-23  Jeremy Katz  <katzj@redhat.com>
 
+	* loader2/modules.c (loadModule): usb-storage has reached new
+	levels of awful and now doesn't enumerate the devices with
+	anything approaching a reasonable speed.  Add a sleep to wait for
+	some devices to show up
+
 	* isys/isys.py (oldSwapLabelMunge): Munge old swap label format to
 	the new version.  Elliot's first pass wasn't accepted upstream so
 	we need to try to do some conversion.  We should probably nuke
diff --git a/loader2/modules.c b/loader2/modules.c
index 09ed3cd19..6d9760ec3 100644
--- a/loader2/modules.c
+++ b/loader2/modules.c
@@ -254,7 +254,8 @@ static int loadModule(const char * modName, struct extractedModule * path,
     int deviceCount = -1;
     int popWindow = 0;
     int rc, child, i, status;
-
+    static int usbWasLoaded = 0;
+ 
     /* don't need to load a module that's already loaded */
     if (mlModuleInList(modName, modLoaded))
         return 0;
@@ -332,6 +333,19 @@ static int loadModule(const char * modName, struct extractedModule * path,
                     modLoaded->mods[num].firstDevNum = deviceCount;
                     modLoaded->mods[num].lastDevNum = ethCount("tr") - 1;
                 } else if (mi->major == DRIVER_SCSI) {
+                    /* FIXME: this is a hack, but usb-storage seems to
+                     * like to take forever to enumerate.  try to 
+                     * give it some time */
+                    if (!strcmp(modName, "usb-storage") && usbWasLoaded == 0) {
+                        int slp;
+                        usbWasLoaded++;
+                        logMessage("sleeping for usb-storage stabilize...");
+                        for (slp = 0; slp < 10; slp++) {
+                            if (scsiDiskCount() > 0) break;
+                            sleep(2);
+                        }
+                        logMessage("slept %d seconds", slp * 2);
+                    }
                     modLoaded->mods[num].firstDevNum = deviceCount;
                     modLoaded->mods[num].lastDevNum = scsiDiskCount();
                 }