diff options
| author | Chris Lumens <clumens@redhat.com> | 2008-06-04 15:12:19 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-06-18 10:44:56 -0400 |
| commit | af44569a426b3286dc8781224ac899edbc129092 (patch) | |
| tree | 5f4ecd625dbb09dccb111b00deb22cd4c1614a33 | |
| parent | 023a993cb965b9d8fd81a20d4e7bd14b8ba10b81 (diff) | |
| download | anaconda-af44569a426b3286dc8781224ac899edbc129092.tar.gz anaconda-af44569a426b3286dc8781224ac899edbc129092.tar.xz anaconda-af44569a426b3286dc8781224ac899edbc129092.zip | |
The askmethod cmdline option no longer does anything.
| -rw-r--r-- | loader2/loader.c | 12 | ||||
| -rw-r--r-- | loader2/loader.h | 3 |
2 files changed, 3 insertions, 12 deletions
diff --git a/loader2/loader.c b/loader2/loader.c index b0ded8e2f..d3b75e65c 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -794,10 +794,8 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData, if (!strcasecmp(argv[i], "expert")) { flags |= LOADER_FLAGS_EXPERT; logMessage(INFO, "expert got used, ignoring"); - /* flags |= (LOADER_FLAGS_EXPERT | LOADER_FLAGS_MODDISK | - LOADER_FLAGS_ASKMETHOD);*/ - } else if (!strcasecmp(argv[i], "askmethod")) - flags |= LOADER_FLAGS_ASKMETHOD; + /* flags |= (LOADER_FLAGS_EXPERT | LOADER_FLAGS_MODDISK);*/ + } else if (!strcasecmp(argv[i], "asknetwork")) flags |= LOADER_FLAGS_ASKNETWORK; else if (!strcasecmp(argv[i], "noshell")) @@ -1087,12 +1085,6 @@ static char *doLoaderMain(struct loaderData_s *loaderData, if (!FL_CMDLINE(flags)) startNewt(); - /* have we preselected this to be our install method? */ - if (loaderData->method >= 0) { - /* disable the fast path (#102652) */ - flags |= LOADER_FLAGS_ASKMETHOD; - } - /* Before anything else, see if there's a CD/DVD with a stage2 image on * it. However if stage2= was given, use that value as an override here. * That will also then bypass any method selection UI in loader. diff --git a/loader2/loader.h b/loader2/loader.h index 10c81ed60..0fe703748 100644 --- a/loader2/loader.h +++ b/loader2/loader.h @@ -53,7 +53,7 @@ /* #21 unused */ #define LOADER_FLAGS_MEDIACHECK (((uint64_t) 1) << 22) /* #23 unused */ -#define LOADER_FLAGS_ASKMETHOD (((uint64_t) 1) << 24) +/* #24 unused */ #define LOADER_FLAGS_ASKNETWORK (((uint64_t) 1) << 25) /* #26 unused */ /* #27 unused */ @@ -83,7 +83,6 @@ #define FL_TELNETD(a) ((a) & LOADER_FLAGS_TELNETD) #define FL_NOPASS(a) ((a) & LOADER_FLAGS_NOPASS) #define FL_MEDIACHECK(a) ((a) & LOADER_FLAGS_MEDIACHECK) -#define FL_ASKMETHOD(a) ((a) & LOADER_FLAGS_ASKMETHOD) #define FL_GRAPHICAL(a) ((a) & LOADER_FLAGS_GRAPHICAL) #define FL_CMDLINE(a) ((a) & LOADER_FLAGS_CMDLINE) #define FL_HALT(a) ((a) & LOADER_FLAGS_HALT) |