diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-09-27 21:49:34 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-09-27 21:49:34 +0000 |
| commit | 8e2a9a47d16f073b2d903bcceaf03a087c6774f4 (patch) | |
| tree | f9c9c2c3c3448950bf095095cefa7ef21ac428cf /loader2 | |
| parent | 8cfea1c0024306922a00558e918032cd2919ff0b (diff) | |
| download | anaconda-8e2a9a47d16f073b2d903bcceaf03a087c6774f4.tar.gz anaconda-8e2a9a47d16f073b2d903bcceaf03a087c6774f4.tar.xz anaconda-8e2a9a47d16f073b2d903bcceaf03a087c6774f4.zip | |
2004-09-27 Jeremy Katz <katzj@redhat.com>
* loader2/hardware.c: we need to always do our busprobe (fixes
nonet, etc)
* loader2/loader.c: noprobe ==> nousb and nofirewire
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/hardware.c | 2 | ||||
| -rw-r--r-- | loader2/loader.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/loader2/hardware.c b/loader2/hardware.c index 79277f618..7ac5f1d11 100644 --- a/loader2/hardware.c +++ b/loader2/hardware.c @@ -277,8 +277,6 @@ int busProbe(moduleInfoSet modInfo, moduleList modLoaded, moduleDeps modDeps, * if using noprobe */ initializePcmciaController(modLoaded, modDeps, modInfo, flags); - if (FL_NOPROBE(flags)) return 0; - /* we can't really *probe* on iSeries, but we can pretend */ probeiSeries(modInfo, modLoaded, modDeps, flags); diff --git a/loader2/loader.c b/loader2/loader.c index 658f3ff8d..c737ef4b0 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -512,7 +512,7 @@ static int parseCmdLineFlags(int flags, struct loaderData_s * loaderData, else if (!strcasecmp(argv[i], "nostorage")) flags |= LOADER_FLAGS_NOSTORAGE; else if (!strcasecmp(argv[i], "noprobe")) - flags |= (LOADER_FLAGS_NONET | LOADER_FLAGS_NOSTORAGE); + flags |= (LOADER_FLAGS_NONET | LOADER_FLAGS_NOSTORAGE | LOADER_FLAGS_NOUSB | LOADER_FLAGS_NOIEEE1394); else if (!strcasecmp(argv[i], "nopcmcia")) flags |= LOADER_FLAGS_NOPCMCIA; else if (!strcasecmp(argv[i], "text")) { |