From 9b3db348b48db45f5a636dc50ccac1329950dadd Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Thu, 25 Sep 2003 21:51:56 +0000 Subject: merge driver disk changes from taroon --- loader2/loader.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'loader2') diff --git a/loader2/loader.c b/loader2/loader.c index 0f880a218..7e11f0cb8 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -1366,23 +1366,15 @@ int main(int argc, char ** argv) { } for (i = 0; i < modLoaded->numModules; i++) { - struct moduleInfo * mi; - char * where; - if (!modLoaded->mods[i].path) continue; - - mi = findModuleInfo(modInfo, modLoaded->mods[i].name); - if (!mi) continue; - if (mi->major == DRIVER_NET) - where = "net"; - else if (mi->major == DRIVER_SCSI) - where = "scsi"; - else + if (!strcmp(modLoaded->mods[i].path, + "/mnt/runtime/modules/modules.cgz")) { continue; + } *argptr++ = "--module"; *argptr = alloca(80); - sprintf(*argptr, "%s:%s:%s", modLoaded->mods[i].path, where, + sprintf(*argptr, "%s:%s", modLoaded->mods[i].path, modLoaded->mods[i].name); argptr++; -- cgit