always load vfat right away; it's always available so it saves some time

2 files changed, 5 insertions, 18 deletions

diff --git a/loader/devices.c b/loader/devices.c
index d0eabf90d..27a66fd5b 100644
--- a/loader/devices.c
+++ b/loader/devices.c
@@ -241,9 +241,6 @@ int devLoadDriverDisk(moduleInfoSet modInfo, moduleList modLoaded,
 
 	if (rc == 2) return LOADER_BACK;
 
-	mlLoadModule("vfat", modLoaded, (*modDepsPtr), NULL, modInfo, 
-		     flags);
-
 	ddi->device = strdup(device);
 	ddi->mntDevice = malloc(strlen(device) + 10);
 	sprintf(ddi->mntDevice, "/tmp/%s", device);
@@ -603,9 +600,9 @@ char ** extractModules(struct driverDiskInfo * ddi,
 	    /* can't trust map; the order changed thanks to qsort */
 	    sprintf(fn, "/tmp/%s.o", modNames[i]);
 	    if (!access(fn, R_OK)) {
-		logMessage("module %s found%s%s", modNames[i],
-			ddi ? " on driver disk " : "",
-			ddi ? ddi->title : "");
+		if (ddi)
+		    logMessage("module %s found on driver disk %s", 
+				modNames[i], ddi->title);
 		oldPaths[i] = strdup(fn);
 	    }
 	    numMaps++;
diff --git a/loader/loader.c b/loader/loader.c
index 1603eec75..abb264928 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -746,9 +746,6 @@ static char * mountHardDrive(struct installMethod * method,
     static int ufsloaded;
     #endif
 
-    mlLoadModule("vfat", modLoaded, *modDepsPtr, 
-		 NULL, modInfo, flags);
-
     while (!done) {
 	numPartitions = 0;
 	for (i = 0; i < kd->numKnown; i++) {
@@ -1562,10 +1559,6 @@ static int kickstartDevices(struct knownDevices * kd, moduleInfoSet modInfo,
 		ddi->mntDevice = fsDevice;
 	    }
 
-	    if (!strcmp(ddi->fs, "vfat"))
-		mlLoadModule("vfat", modLoaded, *modDepsPtr, NULL, 
-			     modInfo, flags);
-
 	    logMessage("looking for driver disk (%s, %s, %s)",
 		       ddi->fs, ddi->device, ddi->mntDevice);
 
@@ -2137,7 +2130,6 @@ int kickstartFromHardDrive(char * location,
     char * fileName;
     char * fullFn;
 
-    mlLoadModule("vfat", modLoaded, *modDepsPtr, NULL, NULL, flags);
 #ifdef __sparc__
     mlLoadModule("ufs", modLoaded, *modDepsPtr, NULL, NULL, flags);
 #endif
@@ -2180,8 +2172,6 @@ int kickstartFromHardDrive(char * location,
 
 int kickstartFromFloppy(char * location, moduleList modLoaded,
 			moduleDeps * modDepsPtr, int flags) {
-    mlLoadModule("vfat", modLoaded, *modDepsPtr, NULL, NULL, flags);
-
     if (devMakeInode(floppyDevice, "/tmp/floppy"))
 	return 1;
 
@@ -2637,7 +2627,7 @@ int main(int argc, char ** argv) {
     modDeps = mlNewDeps();
     mlLoadDeps(&modDeps, "/modules/modules.dep");
 
-    mlLoadModule("cramfs", modLoaded, modDeps, NULL, modInfo, flags);
+    mlLoadModule("cramfs:vfat", modLoaded, modDeps, NULL, modInfo, flags);
 
     if (!continuing) {
 	ideSetup(modLoaded, modDeps, modInfo, flags, &kd);
@@ -2857,7 +2847,7 @@ int main(int argc, char ** argv) {
     /* We must look for cards which require the agpgart module */
     agpgartInitialize(modLoaded, modDeps, modInfo, flags);
 
-    mlLoadModule("raid0:raid1:raid5:msdos:vfat:ext3:reiserfs", 
+    mlLoadModule("raid0:raid1:raid5:msdos:ext3:reiserfs", 
 		 modLoaded, modDeps, NULL, modInfo, flags);
 
     usbInitializeMouse(modLoaded, modDeps, modInfo, flags);