diff options
| author | Matt Wilson <msw@redhat.com> | 2001-06-27 06:27:58 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2001-06-27 06:27:58 +0000 |
| commit | 2bba38c5baec17e551edab1b3fbfb62d8f315e5b (patch) | |
| tree | cb8bc51e99a07d940ebc583b44e1de73bb8523cc /dispatch.py | |
| parent | 08a3c481379fbf7d89894ab44a8805f155e0d0e9 (diff) | |
| download | anaconda-2bba38c5baec17e551edab1b3fbfb62d8f315e5b.tar.gz anaconda-2bba38c5baec17e551edab1b3fbfb62d8f315e5b.tar.xz anaconda-2bba38c5baec17e551edab1b3fbfb62d8f315e5b.zip | |
break upgrade swap suggestion out into another step and store its findings in
instdata.
Diffstat (limited to 'dispatch.py')
| -rw-r--r-- | dispatch.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/dispatch.py b/dispatch.py index 06918a15b..295fc72ed 100644 --- a/dispatch.py +++ b/dispatch.py @@ -27,6 +27,7 @@ from bootloader import partitioningComplete, writeBootloader from bootloader import bootloaderSetupChoices from flags import flags from upgrade import upgradeFindPackages, upgradeMountFilesystems +from upgrade import upgradeSwapSuggestion # These are all of the install steps, in order. Note that upgrade and # install steps are the same thing! Upgrades skip install steps, while @@ -49,8 +50,6 @@ installSteps = [ ( "reconfigkeyboard", ("id.instLanguage", "id.keyboard" ) ), ( "installtype", ("dispatch", "id", "method", "intf") ), ( "findinstall", ("dispatch", "intf", "id", "instPath") ), - ( "upgradecontinue", queryUpgradeContinue, ("intf", "dir")), - ( "addswap", ("dispatch", "intf", "id.fsset", "instPath") ), ( "partitionmethod", ("id",) ), ( "partitionobjinit", partitionObjectsInitialize, ("id", "dir") ), ( "partitionmethodsetup", partitionMethodSetup, ("id", "dispatch") ), @@ -60,6 +59,10 @@ installSteps = [ ( "partition", ("id.fsset", "id.diskset", "id.partrequests", "intf")), ( "upgrademount", upgradeMountFilesystems, ("intf", "id.upgradeRoot", "id.fsset", "instPath")), + ( "upgradecontinue", queryUpgradeContinue, ("intf", "dir")), + ( "upgradeswapsuggestion", upgradeSwapSuggestion, ("dispatch", "id", + "instPath") ), + ( "addswap", ("intf", "id.fsset", "instPath", "id.upgradeSwapInfo") ), ( "partitiondone", partitioningComplete, ("dispatch", "id.bootloader", "id.fsset", "id.diskset", "id.partrequests") ), |