diff options
-rwxr-xr-x | anaconda | 3 | ||||
-rw-r--r-- | flags.py | 1 | ||||
-rw-r--r-- | installclass.py | 6 | ||||
-rw-r--r-- | installclasses/fedora.py | 4 | ||||
-rw-r--r-- | installclasses/rhel.py | 4 | ||||
-rw-r--r-- | loader2/loader.c | 9 | ||||
-rw-r--r-- | loader2/loader.h | 3 |
7 files changed, 10 insertions, 20 deletions
@@ -221,7 +221,6 @@ def parseOptions(): # Method of operation op.add_option("--autostep", action="store_true", default=False) op.add_option("-d", "--debug", dest="debug", action="store_true", default=False) - op.add_option("--expert", action="store_true", default=False) op.add_option("--kickstart", dest="ksfile") op.add_option("--rescue", dest="rescue", action="store_true", default=False) op.add_option("-r", "--rootpath", action="callback", callback=rootpath_cb, dest="rootPath", @@ -435,7 +434,7 @@ def setupLoggingFromOpts(opts): def getInstClass(): from installclass import DefaultInstall - return DefaultInstall(flags.expert) + return DefaultInstall() # ftp installs pass the password via a file in /tmp so # ps doesn't show it @@ -64,7 +64,6 @@ class Flags: self.__dict__['flags']['test'] = 0 self.__dict__['flags']['rootpath'] = 0 self.__dict__['flags']['livecdInstall'] = 0 - self.__dict__['flags']['expert'] = 0 self.__dict__['flags']['iscsi'] = 0 self.__dict__['flags']['serial'] = 0 self.__dict__['flags']['setupFilesystems'] = 1 diff --git a/installclass.py b/installclass.py index 029900535..b99a091e7 100644 --- a/installclass.py +++ b/installclass.py @@ -214,7 +214,7 @@ class BaseInstallClass(object): anaconda.id.reset() anaconda.id.instClass = self - def __init__(self, expert): + def __init__(self): pass allClasses = [] @@ -340,6 +340,6 @@ baseclass = getBaseInstallClass() # we need to be able to differentiate between this and custom class DefaultInstall(baseclass): - def __init__(self, expert): - BaseInstallClass.__init__(self, expert) + def __init__(self): + BaseInstallClass.__init__(self) diff --git a/installclasses/fedora.py b/installclasses/fedora.py index c1923a47a..bbcff8d92 100644 --- a/installclasses/fedora.py +++ b/installclasses/fedora.py @@ -75,5 +75,5 @@ class InstallClass(BaseInstallClass): else: return yuminstall.YumBackend - def __init__(self, expert): - BaseInstallClass.__init__(self, expert) + def __init__(self): + BaseInstallClass.__init__(self) diff --git a/installclasses/rhel.py b/installclasses/rhel.py index 11467988d..668e9cb53 100644 --- a/installclasses/rhel.py +++ b/installclasses/rhel.py @@ -177,8 +177,8 @@ class InstallClass(BaseInstallClass): def getBackend(self): return yuminstall.YumBackend - def __init__(self, expert): - BaseInstallClass.__init__(self, expert) + def __init__(self): + BaseInstallClass.__init__(self) self.repopaths = { "base": "%s" %(productPath,) } 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) |