diff options
| author | Chris Lumens <clumens@redhat.com> | 2008-08-14 15:31:04 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-08-14 15:31:04 -0400 |
| commit | f24fab69d4cf07c5dfb55a62558505ea206dcb8c (patch) | |
| tree | 6a76ebf9686f7088a705b84dc0612d64899bbeb5 /loader2 | |
| parent | e218121a2080b73435a49d8857eff6d847252088 (diff) | |
| download | anaconda-f24fab69d4cf07c5dfb55a62558505ea206dcb8c.tar.gz anaconda-f24fab69d4cf07c5dfb55a62558505ea206dcb8c.tar.xz anaconda-f24fab69d4cf07c5dfb55a62558505ea206dcb8c.zip | |
Expert mode was disabled in 2004. Remove it now.
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/loader.c | 9 | ||||
| -rw-r--r-- | loader2/loader.h | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/loader2/loader.c b/loader2/loader.c index 378e5299d..c14638a68 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -810,12 +810,7 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData, return; for (i=0; i < argc; i++) { - if (!strcasecmp(argv[i], "expert")) { - flags |= LOADER_FLAGS_EXPERT; - logMessage(INFO, "expert got used, ignoring"); - /* flags |= (LOADER_FLAGS_EXPERT | LOADER_FLAGS_MODDISK);*/ - } - else if (!strcasecmp(argv[i], "asknetwork")) + if (!strcasecmp(argv[i], "asknetwork")) flags |= LOADER_FLAGS_ASKNETWORK; else if (!strcasecmp(argv[i], "noshell")) flags |= LOADER_FLAGS_NOSHELL; @@ -2064,8 +2059,6 @@ int main(int argc, char ** argv) { *argptr++ = "--graphical"; if (FL_CMDLINE(flags)) *argptr++ = "-C"; - if (FL_EXPERT(flags)) - *argptr++ = "--expert"; if (!FL_SELINUX(flags)) *argptr++ = "--noselinux"; else if (FL_SELINUX(flags)) diff --git a/loader2/loader.h b/loader2/loader.h index ac28f1363..6f68d9fd9 100644 --- a/loader2/loader.h +++ b/loader2/loader.h @@ -28,7 +28,7 @@ #define LOADER_ERROR -1 #define LOADER_FLAGS_TESTING (((uint64_t) 1) << 0) -#define LOADER_FLAGS_EXPERT (((uint64_t) 1) << 1) +/* #1 unused */ #define LOADER_FLAGS_TEXT (((uint64_t) 1) << 2) #define LOADER_FLAGS_RESCUE (((uint64_t) 1) << 3) #define LOADER_FLAGS_KICKSTART (((uint64_t) 1) << 4) @@ -66,7 +66,6 @@ #define LOADER_FLAGS_HAVE_CMSCONF (((uint64_t) 1) << 37) #define FL_TESTING(a) ((a) & LOADER_FLAGS_TESTING) -#define FL_EXPERT(a) ((a) & LOADER_FLAGS_EXPERT) #define FL_TEXT(a) ((a) & LOADER_FLAGS_TEXT) #define FL_RESCUE(a) ((a) & LOADER_FLAGS_RESCUE) #define FL_KICKSTART(a) ((a) & LOADER_FLAGS_KICKSTART) |