diff options
| author | Chris Lumens <clumens@redhat.com> | 2006-02-17 16:29:01 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2006-02-17 16:29:01 +0000 |
| commit | 2c5d0152f929dc79e76351ac4a92a7ddbebc6071 (patch) | |
| tree | 1971ea07663e1016c8ad13c6977d75bf3d815c3d /kickstart.py | |
| parent | dbb7758ce2571bbce30d6ba495ebf9c168e8a623 (diff) | |
| download | anaconda-2c5d0152f929dc79e76351ac4a92a7ddbebc6071.tar.gz anaconda-2c5d0152f929dc79e76351ac4a92a7ddbebc6071.tar.xz anaconda-2c5d0152f929dc79e76351ac4a92a7ddbebc6071.zip | |
Lots of kickstart fixes.
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/kickstart.py b/kickstart.py index 9bc69ed22..95d5c58c3 100644 --- a/kickstart.py +++ b/kickstart.py @@ -252,6 +252,7 @@ class AnacondaKSHandlers(KickstartHandlers): request.fsopts = lvd.fsopts id.instClass.addPartRequest(id.partitions, request) + self.skipSteps.extend(["partition", "zfcpconfig", "parttype"]) def doMediaCheck(self, id, args): KickstartHandlers.doMediaCheck(self, args) @@ -493,6 +494,7 @@ class AnacondaKSHandlers(KickstartHandlers): request.fsopts = rd.fsopts id.instClass.addPartRequest(id.partitions, request) + self.skipSteps.extend(["partition", "zfcpconfig", "parttype"]) def doRootPw(self, id, args): KickstartHandlers.doRootPw(self, args) @@ -609,7 +611,8 @@ class VNCHandlers(KickstartHandlers): class KickstartPreParser(KickstartParser): def __init__ (self, ksdata, kshandlers): self.handler = kshandlers - KickstartParser.__init__(self, ksdata, kshandlers) + KickstartParser.__init__(self, ksdata, kshandlers, + missingIncludeIsFatal=False) def addScript (self): if self.state == STATE_PRE: @@ -817,17 +820,21 @@ class Kickstart(BaseInstallClass): dispatch.skipStep("bootdisk") dispatch.skipStep("welcome") dispatch.skipStep("betanag") - dispatch.skipStep("confirminstall") - dispatch.skipStep("confirmupgrade") dispatch.skipStep("installtype") dispatch.skipStep("tasksel") + if not self.ksdata.interactive: + dispatch.skipStep("confirminstall") + dispatch.skipStep("confirmupgrade") + if len(self.ksdata.groupList) > 0 or len(self.ksdata.packageList) > 0 or \ len(self.ksdata.excludedList) > 0: if self.ksdata.interactive: self.handlers.showSteps.append("group-selection") else: self.handlers.skipSteps.append("group-selection") + else: + self.handlers.showSteps.append("group-selection") if not self.ksdata.interactive: for n in self.handlers.skipSteps: |