diff options
| author | Matt Wilson <msw@redhat.com> | 2001-01-22 19:29:41 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2001-01-22 19:29:41 +0000 |
| commit | 3fd4af916d8a1b34d1e98449ca23342dc753540b (patch) | |
| tree | 7650b70dd66ce05fcbae844f231fed1b37e911bb /loader | |
| parent | 2b34ab2763bb3675d88fa24502dccdee503b43ce (diff) | |
| download | anaconda-3fd4af916d8a1b34d1e98449ca23342dc753540b.tar.gz anaconda-3fd4af916d8a1b34d1e98449ca23342dc753540b.tar.xz anaconda-3fd4af916d8a1b34d1e98449ca23342dc753540b.zip | |
add nopcmcia option (dell req)
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader.c | 4 | ||||
| -rw-r--r-- | loader/loader.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/loader/loader.c b/loader/loader.c index fb630f82f..16d547ac5 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1952,6 +1952,8 @@ static int parseCmdLineFlags(int flags, char * cmdLine, char ** ksSource, flags |= LOADER_FLAGS_NOUSB; else if (!strcasecmp(argv[i], "noprobe")) flags |= LOADER_FLAGS_NOPROBE; + else if (!strcasecmp(argv[i], "nopcmcia")) + flags |= LOADER_FLAGS_NOPCMCIA; else if (!strcasecmp(argv[i], "text")) flags |= LOADER_FLAGS_TEXT; else if (!strcasecmp(argv[i], "updates")) @@ -2607,7 +2609,7 @@ int main(int argc, char ** argv) { #ifdef INCLUDE_PCMCIA startNewt(flags); - if (!continuing) { + if (!continuing && !FL_NOPCMCIA(flags)) { startPcmcia(floppyDevice, modLoaded, modDeps, modInfo, pcic, flags); } #endif diff --git a/loader/loader.h b/loader/loader.h index 2d1d229fb..565217c20 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -22,6 +22,7 @@ #define LOADER_FLAGS_NOUSB (1 << 16) #define LOADER_FLAGS_NOSHELL (1 << 17) #define LOADER_FLAGS_LOWRES (1 << 18) +#define LOADER_FLAGS_NOPCMCIA (1 << 16) #define FL_TESTING(a) ((a) & LOADER_FLAGS_TESTING) #define FL_EXPERT(a) ((a) & LOADER_FLAGS_EXPERT) @@ -42,6 +43,7 @@ #define FL_NOUSB(a) ((a) & LOADER_FLAGS_NOUSB) #define FL_NOSHELL(a) ((a) & LOADER_FLAGS_NOSHELL) #define FL_LOWRES(a) ((a) & LOADER_FLAGS_LOWRES) +#define FL_NOPCMCIA(a) ((a) & LOADER_FLAGS_NOPCMCIA) #define CODE_PCMCIA 1 |