diff options
| author | Chris Lumens <clumens@redhat.com> | 2005-10-07 20:53:40 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2005-10-07 20:53:40 +0000 |
| commit | bc5b7822ff577c66cc2edadef717ea6a18b9699d (patch) | |
| tree | 0d6e31fba845b1a4c13e6ea624e96325f0079696 /kickstart.py | |
| parent | 90dfe9d6b4be0ea429a8002bde0a5fbe15b08b60 (diff) | |
| download | anaconda-bc5b7822ff577c66cc2edadef717ea6a18b9699d.tar.gz anaconda-bc5b7822ff577c66cc2edadef717ea6a18b9699d.tar.xz anaconda-bc5b7822ff577c66cc2edadef717ea6a18b9699d.zip | |
Missed one.
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/kickstart.py b/kickstart.py index d5584dae2..d544650b6 100644 --- a/kickstart.py +++ b/kickstart.py @@ -577,7 +577,7 @@ class KickstartPreParser(KickstartParser): s = AnacondaKSScript (self.script["body"], self.script["interp"], self.script["chroot"], self.script["log"], self.script["errorOnFail"]) - self.ksdata.preScripts.append(s) + self.ksdata.scripts.append(s) def addPackages (self, line): pass @@ -616,14 +616,9 @@ class AnacondaKSParser(KickstartParser): s = AnacondaKSScript (self.script["body"], self.script["interp"], self.script["chroot"], self.script["log"], - self.script["errorOnFail"]) + self.script["errorOnFail"], self.script["type"]) - if self.state == STATE_PRE: - self.ksdata.preScripts.append(s) - elif self.state == STATE_POST: - self.ksdata.postScripts.append(s) - elif self.state == STATE_TRACEBACK: - self.ksdata.tracebackScripts.append(s) + self.ksdata.scripts.append(s) def handleCommand (self, cmd, args): if not self.handler: @@ -663,20 +658,24 @@ class Kickstart(BaseInstallClass): def runPreScripts(self, intf = None): log.info("Running kickstart %%pre script(s)") - for script in self.ksdata.preScripts: + for script in filter (lambda s: s.type == KS_SCRIPT_PRE, + self.ksdata.scripts): script.run("/", self.serial, intf) log.info("All kickstart %%pre script(s) have been run") def postAction(self, rootPath, serial, intf = None): log.info("Running kickstart %%post script(s)") - for script in self.ksdata.postScripts: + for script in filter (lambda s: s.type == KS_SCRIPT_POST, + self.ksdata.scripts): script.run(rootPath, serial, intf) log.info("All kickstart %%post script(s) have been run") def runTracebackScripts(self): log.info("Running kickstart %%traceback script(s)") - for script in self.ksdata.tracebackScripts: + for script in filter (lambda s: s.type == KS_SCRIPT_TRACEBAC, + self.ksdata.scripts): script.run("/", self.serial) + log.info("All kickstart %%traceback script(s) have been run") def setInstallData (self, id, intf = None): BaseInstallClass.setInstallData(self, id) |