probing/module loading is safe in test mode. also, pop up a window when we do the firewire modload because it's a tad slow and looks like the installer has hung otherwise since you're just sitting at the black screen

1 files changed, 8 insertions, 2 deletions

diff --git a/loader/loader.c b/loader/loader.c
index 7e2fcecec..f2d860046 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -3042,15 +3042,20 @@ static int firewireInitialize(moduleList modLoaded, moduleDeps modDeps,
 
     logMessage("found firewire controller %s", devices[0]->driver);
 
+    /* not the best message in the world, but better than sitting
+     * and looking silly */
+    winStatus(40, 3, _("Loading"), _("Loading %s driver..."), 
+              devices[0]->driver);
+
     if (mlLoadModuleSet(devices[0]->driver, modLoaded, modDeps, modInfo,
 			flags)) {
 	logMessage("failed to insert firewire module");
 	return 1;
     }
 
-    if (FL_TESTING(flags)) return 0;
-
     sleep(3);
+    newtPopWindow();
+
     logMessage("probing for firewire scsi devices");
     devices = probeDevices(CLASS_SCSI, BUS_FIREWIRE, PROBE_ALL);
 
@@ -3398,6 +3403,7 @@ int main(int argc, char ** argv) {
 	   a system w/o USB keyboard support, which would be bad. */
 	usbInitialize(modLoaded, modDeps, modInfo, flags);
 
+        startNewt(flags);
 	/* now let's initialize any possible firewire.  fun */
 	firewireInitialize(modLoaded, modDeps, modInfo, flags);
     }