diff options
| author | Chris Lumens <clumens@redhat.com> | 2007-06-27 20:03:32 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2007-06-27 20:03:32 +0000 |
| commit | 0dff8a9ee9157e5fa4cc7431fc89c9948efcc8ce (patch) | |
| tree | fd411ef439be3f47bdb0feca568c41c3020912a6 /loader2 | |
| parent | c238554b3770ff8f7e810c5fe4c0389c90bd9530 (diff) | |
Try to extract modules that are in a module ball other than the default one
first. This allows driver disks to override the shipped modules.
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/modules.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/loader2/modules.c b/loader2/modules.c index b65421eda..ca68f6ab3 100644 --- a/loader2/modules.c +++ b/loader2/modules.c @@ -450,7 +450,6 @@ static int doLoadModules(const char * origModNames, moduleList modLoaded, char ** list, ** l; char items[1024] = ""; /* 1024 characters should be enough... */ struct extractedModule * paths, * p; - struct moduleBallLocation *location = NULL; struct loadedModuleInfo * mod; int i; int reloadUsbStorage; @@ -508,10 +507,8 @@ static int doLoadModules(const char * origModNames, moduleList modLoaded, if (modInfo) { for (i = 0; list[i]; i++) { mi = findModuleInfo(modInfo, list[i]); - if (mi) { - if (mi->locationID) - location = mi->locationID; - paths = extractModules(list, paths, location); + if (mi && mi->locationID) { + paths = extractModules(list, paths, mi->locationID); if (mi->major == DRIVER_SCSI && (mod = getLoadedModuleInfo(modLoaded, "usb-storage")) && |