summaryrefslogtreecommitdiffstats
path: root/anaconda
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2012-07-11 11:31:41 -0400
committerChris Lumens <clumens@redhat.com>2012-07-12 13:28:05 -0400
commit99ae2decf54a4d407d6b50095db589fa09d67eb8 (patch)
treea29d53a9a2d9c74ea320e3f182e2c16ce8c4473e /anaconda
parentb947da6465aea483f22a66ac0692fd7293c3d511 (diff)
downloadanaconda-99ae2decf54a4d407d6b50095db589fa09d67eb8.tar.gz
anaconda-99ae2decf54a4d407d6b50095db589fa09d67eb8.tar.xz
anaconda-99ae2decf54a4d407d6b50095db589fa09d67eb8.zip
Kickstart command handlers no longer need an anaconda instance.
This removes a lot of the special purpose code that made up the special AnacondaKSHandler subclass. There's also no need for the _dataObjs attribute anymore since we can't just blindly iterate over all kickstart objects any more. Some need to be run at one point, and some at another point.
Diffstat (limited to 'anaconda')
-rwxr-xr-xanaconda6
1 files changed, 3 insertions, 3 deletions
diff --git a/anaconda b/anaconda
index d92269bd1..bc518b7a1 100755
--- a/anaconda
+++ b/anaconda
@@ -845,8 +845,8 @@ if __name__ == "__main__":
if opts.ksfile:
flags.automatedInstall = True
- kickstart.preScriptPass(anaconda, opts.ksfile)
- ksdata = kickstart.parseKickstart(anaconda, opts.ksfile)
+ kickstart.preScriptPass(opts.ksfile)
+ ksdata = kickstart.parseKickstart(opts.ksfile)
if ksdata.rescue.rescue:
anaconda.rescue = True
@@ -854,7 +854,7 @@ if __name__ == "__main__":
# how anaconda operates.
ksdata.logging.execute()
else:
- ksdata = kickstart.AnacondaKSHandler(anaconda)
+ ksdata = kickstart.AnacondaKSHandler()
anaconda.ksdata = ksdata