diff options
| -rw-r--r-- | bootloader.py | 4 | ||||
| -rw-r--r-- | dispatch.py | 7 | ||||
| -rw-r--r-- | installclass.py | 1 | ||||
| -rw-r--r-- | installclasses/upgradeclass.py | 3 | ||||
| -rw-r--r-- | instdata.py | 1 | ||||
| -rw-r--r-- | iw/examine_gui.py | 3 | ||||
| -rw-r--r-- | textw/upgrade_text.py | 3 | ||||
| -rw-r--r-- | upgrade.py | 1 | ||||
| -rw-r--r-- | upgradeclass.py | 3 |
9 files changed, 17 insertions, 9 deletions
diff --git a/bootloader.py b/bootloader.py index 5309a5b3b..5fdd078c5 100644 --- a/bootloader.py +++ b/bootloader.py @@ -398,7 +398,8 @@ def partitioningComplete(dispatch, bl, fsset, diskSet, partitions): continue entry = request.toEntry() fsset.add (entry) - + +def bootloaderSetupChoices(dispatch, bl, fsset, diskSet): choices = fsset.bootloaderChoices(diskSet) if not choices: dispatch.skipStep("instbootloader") @@ -409,7 +410,6 @@ def partitioningComplete(dispatch, bl, fsset, diskSet, partitions): if bl.setDefaultDevice and choices: bl.setDevice(choices[0][0]) - def writeBootloader(intf, instRoot, fsset, bl, langs, comps): justConfigFile = not flags.setupFilesystems diff --git a/dispatch.py b/dispatch.py index ae21e27f0..06918a15b 100644 --- a/dispatch.py +++ b/dispatch.py @@ -24,8 +24,9 @@ from autopart import doAutoPartition from partitioning import partitionMethodSetup, partitionObjectsInitialize from floppy import makeBootdisk from bootloader import partitioningComplete, writeBootloader +from bootloader import bootloaderSetupChoices from flags import flags -from upgrade import upgradeFindPackages +from upgrade import upgradeFindPackages, upgradeMountFilesystems # These are all of the install steps, in order. Note that upgrade and # install steps are the same thing! Upgrades skip install steps, while @@ -57,9 +58,13 @@ installSteps = [ ( "autopartitionexecute", doAutoPartition, ("dir", "id", "intf")), ( "fdisk", ("id.useFdisk", "id.diskset", "id.partrequests")), ( "partition", ("id.fsset", "id.diskset", "id.partrequests", "intf")), + ( "upgrademount", upgradeMountFilesystems, ("intf", "id.upgradeRoot", + "id.fsset", "instPath")), ( "partitiondone", partitioningComplete, ("dispatch", "id.bootloader", "id.fsset", "id.diskset", "id.partrequests") ), + ( "bootloadersetup", bootloaderSetupChoices, ("dispatch", "id.bootloader", + "id.fsset", "id.diskset") ), ( "bootloader", ("dispatch", "id.bootloader", "id.fsset", "id.diskset") ), ( "network", ("id.network",) ), ( "firewall", ("id.network", "id.firewall") ), diff --git a/installclass.py b/installclass.py index 542a89460..5f85e3a6f 100644 --- a/installclass.py +++ b/installclass.py @@ -103,6 +103,7 @@ class BaseInstallClass: "fdisk", "partition", "partitiondone", + "bootloadersetup", "bootloader", "network", "firewall", diff --git a/installclasses/upgradeclass.py b/installclasses/upgradeclass.py index 07d940b42..1319b0aaf 100644 --- a/installclasses/upgradeclass.py +++ b/installclasses/upgradeclass.py @@ -23,11 +23,12 @@ class InstallClass(BaseInstallClass): "installtype", "findinstall", "partitionobjinit", - "partitiondone", + "upgrademount", "addswap", "upgradecontinue", "readcomps", "findpackages", + "bootloadersetup", "bootloader", "checkdeps", "dependencies", diff --git a/instdata.py b/instdata.py index 7ac159205..81e8032ac 100644 --- a/instdata.py +++ b/instdata.py @@ -73,6 +73,7 @@ class InstallData: self.dbpath = None self.useFdisk = 0 self.useAutopartitioning = 1 + self.upgradeRoot = None def setInstallProgressClass(self, c): self.instProgress = c diff --git a/iw/examine_gui.py b/iw/examine_gui.py index 8268828e1..727673585 100644 --- a/iw/examine_gui.py +++ b/iw/examine_gui.py @@ -16,8 +16,7 @@ class UpgradeExamineWindow (InstallWindow): self.root = newPart def getNext (self): - upgradeMountFilesystems (self.intf, self.root, self.id.fsset, - self.chroot) + self.id.upgradeRoot = self.root if self.individualPackages.get_active(): self.dispatch.skipStep("indivpackage", skip = 0) else: diff --git a/textw/upgrade_text.py b/textw/upgrade_text.py index bb7df7468..0d04cc7d7 100644 --- a/textw/upgrade_text.py +++ b/textw/upgrade_text.py @@ -153,8 +153,7 @@ class UpgradeExamineWindow: if rc == TEXT_BACK_CHECK: return INSTALL_BACK - upgrade.upgradeMountFilesystems (intf, root, id.fsset, chroot) - + id.upgradeRoot = root # if root is on vfat we want to always display boot floppy screen # otherwise they can't boot! diff --git a/upgrade.py b/upgrade.py index 3e71d6506..b8f8be75c 100644 --- a/upgrade.py +++ b/upgrade.py @@ -171,6 +171,7 @@ def createSwapFile(instPath, thefsset, mntPoint, size): 0, 0)) f.close() +# XXX handle going backwards def upgradeMountFilesystems(intf, rootInfo, oldfsset, instPath): # mount everything and turn on swap diff --git a/upgradeclass.py b/upgradeclass.py index 07d940b42..1319b0aaf 100644 --- a/upgradeclass.py +++ b/upgradeclass.py @@ -23,11 +23,12 @@ class InstallClass(BaseInstallClass): "installtype", "findinstall", "partitionobjinit", - "partitiondone", + "upgrademount", "addswap", "upgradecontinue", "readcomps", "findpackages", + "bootloadersetup", "bootloader", "checkdeps", "dependencies", |