diff options
| -rw-r--r-- | dispatch.py | 3 | ||||
| -rw-r--r-- | installclass.py | 1 | ||||
| -rw-r--r-- | installclasses/upgradeclass.py | 1 | ||||
| -rw-r--r-- | installclasses/upgradeonly.py | 1 | ||||
| -rw-r--r-- | instdata.py | 1 | ||||
| -rw-r--r-- | packages.py | 3 | ||||
| -rw-r--r-- | upgradeclass.py | 1 |
7 files changed, 9 insertions, 2 deletions
diff --git a/dispatch.py b/dispatch.py index 929b513b2..784e02b3f 100644 --- a/dispatch.py +++ b/dispatch.py @@ -21,7 +21,7 @@ from packages import handleX11Packages, writeConfiguration, writeXConfiguration from packages import writeKSConfiguration, turnOnFilesystems from packages import doMigrateFilesystems from packages import queryUpgradeContinue -from packages import doPreInstall, doPostInstall +from packages import doPreInstall, doPostInstall, doPostAction from autopart import doAutoPartition from partitioning import partitionMethodSetup, partitionObjectsInitialize from partitioning import partitioningComplete @@ -119,6 +119,7 @@ installSteps = [ ("instbootloader", writeBootloader, ("intf", "instPath", "id.fsset", "id.bootloader", "id.langSupport", "id.comps")), + ("dopostaction", doPostAction, ("id", "instPath")), ("bootdisk", ("dir", "dispatch", "id.fsset")), ("makebootdisk", makeBootdisk, ("intf", "id.floppyDevice", "id.hdList", "instPath")), diff --git a/installclass.py b/installclass.py index b8d156307..0a2e0d3d8 100644 --- a/installclass.py +++ b/installclass.py @@ -104,6 +104,7 @@ class BaseInstallClass: "postinstallconfig", "writeconfig", "instbootloader", + "dopostaction", "writexconfig", "writeksconfig", "bootdisk", diff --git a/installclasses/upgradeclass.py b/installclasses/upgradeclass.py index d47c3c5b1..268f753cb 100644 --- a/installclasses/upgradeclass.py +++ b/installclasses/upgradeclass.py @@ -44,6 +44,7 @@ class InstallClass(BaseInstallClass): "installpackages", "postinstallconfig", "instbootloader", + "dopostaction", "bootdisk", "complete" ) diff --git a/installclasses/upgradeonly.py b/installclasses/upgradeonly.py index 717f34139..111347242 100644 --- a/installclasses/upgradeonly.py +++ b/installclasses/upgradeonly.py @@ -37,6 +37,7 @@ class InstallClass(BaseInstallClass): "installpackages", "postinstallconfig", "instbootloader", + "dopostaction", "bootdisk", "complete" ) diff --git a/instdata.py b/instdata.py index dc0b3dc46..d8d6f40b1 100644 --- a/instdata.py +++ b/instdata.py @@ -100,7 +100,6 @@ class InstallData: self.firewall.write (instPath) self.rootPassword.write (instPath, self.auth) self.accounts.write (instPath, self.auth) - self.instClass.postAction(instPath, flags.serial) def writeKS(self, filename): # make it so only root can read, could have password diff --git a/packages.py b/packages.py index bcd35c9dc..90502b757 100644 --- a/packages.py +++ b/packages.py @@ -46,6 +46,9 @@ def queryUpgradeContinue(intf, dir): sys.exit(0) return DISPATCH_FORWARD +def doPostAction(id, instPath): + id.instClass.postAction(instPath, flags.serial) + def writeConfiguration(id, instPath): log("Writing main configuration") if not flags.test: diff --git a/upgradeclass.py b/upgradeclass.py index d47c3c5b1..268f753cb 100644 --- a/upgradeclass.py +++ b/upgradeclass.py @@ -44,6 +44,7 @@ class InstallClass(BaseInstallClass): "installpackages", "postinstallconfig", "instbootloader", + "dopostaction", "bootdisk", "complete" ) |