diff options
author | Jeremy Katz <katzj@redhat.com> | 2006-08-10 15:15:01 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2006-08-10 15:15:01 +0000 |
commit | 69dd7c101fbecc7f745aead56398a65169d69cdf (patch) | |
tree | f792840973f31461acf1dc5f6509b4210c7ab932 /kickstart.py | |
parent | cda2b01dba1bff4e9885ddb7ec9484c8baf88ce9 (diff) | |
download | anaconda-69dd7c101fbecc7f745aead56398a65169d69cdf.tar.gz anaconda-69dd7c101fbecc7f745aead56398a65169d69cdf.tar.xz anaconda-69dd7c101fbecc7f745aead56398a65169d69cdf.zip |
2006-08-10 Jeremy Katz <katzj@redhat.com>
* installclass.py (getBaseInstallClass): Add a method for finding
the default base install class so that I don't copy and paste the
code between kickstart and upgrade cases
* kickstart.py (Kickstart): Use getBaseInstallClass
* upgradeclass.py (InstallClass): Use proper base install
class (#201745)
Diffstat (limited to 'kickstart.py')
-rw-r--r-- | kickstart.py | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/kickstart.py b/kickstart.py index 1040a46ac..efab62b58 100644 --- a/kickstart.py +++ b/kickstart.py @@ -720,22 +720,7 @@ class AnacondaKSParser(KickstartParser): self.handler.lineno = lineno self.handler.handlers[cmd](cmdArgs) -# figure out what installclass we should base on. if kickstart wasn't -# an installclass and was instead a data source, this nonsense wouldn't be -# needed -allavail = availableClasses(showHidden = 1) -avail = availableClasses(showHidden = 0) -if len(avail) == 1: - (cname, cobject, clogo) = avail[0] - log.info("%s is only installclass, using for kickstart" %(cname,)) -elif len(allavail) == 1: - (cname, cobject, clogo) = allavail[0] - log.info("%s is only installclass, using for kickstart" %(cname,)) - retval = cobject(flags.expert) -else: - cobject = BaseInstallClass - log.info("using baseinstallclass for kickstart") - +cobject = getBaseInstallClass() # The anaconda kickstart processor. class Kickstart(cobject): |