diff options
| -rw-r--r-- | dispatch.py | 4 | ||||
| -rw-r--r-- | partitions.py | 24 |
2 files changed, 2 insertions, 26 deletions
diff --git a/dispatch.py b/dispatch.py index ea0d2fb20..4c991e40f 100644 --- a/dispatch.py +++ b/dispatch.py @@ -78,8 +78,10 @@ installSteps = [ ("upgradeswapsuggestion", upgradeSwapSuggestion, ), ("addswap", ), ("partitiondone", partitioningComplete, ), + ("enablefilesystems", turnOnFilesystems, ), ("upgrademigfind", upgradeMigrateFind, ), ("upgrademigratefs", ), + ("migratefilesystems", doMigrateFilesystems, ), ("upgbootloader", ), ("bootloadersetup", bootloaderSetupChoices, ), ("bootloader", ), @@ -96,8 +98,6 @@ installSteps = [ ("confirminstall", ), ("confirmupgrade", ), ("install", ), - ("enablefilesystems", turnOnFilesystems, ), - ("migratefilesystems", doMigrateFilesystems, ), ("setuptime", setupTimezone, ), ("preinstallconfig", doPreInstall, ), ("installpackages", doInstall, ), diff --git a/partitions.py b/partitions.py index 3db248d47..ba5b103d8 100644 --- a/partitions.py +++ b/partitions.py @@ -101,30 +101,6 @@ def partitioningComplete(anaconda): raise RuntimeError, ("Managed to not get an entry back from " "request.toEntry") - if (not flags.setupFilesystems - or iutil.memAvailable() > isys.EARLY_SWAP_RAM): - return - - if not anaconda.isKickstart: - rc = anaconda.intf.messageWindow(_("Low Memory"), - _("As you don't have much memory in this " - "machine, we need to turn on swap space " - "immediately. To do this we'll have to " - "write your new partition table to the disk " - "immediately. Is that OK?"), "yesno") - else: - rc = 1 - - if rc: - anaconda.id.partitions.doMetaDeletes(anaconda.id.diskset) - anaconda.id.fsset.setActive(anaconda.id.diskset) - anaconda.id.diskset.savePartitions () - anaconda.id.fsset.createLogicalVolumes(anaconda.rootPath) - anaconda.id.fsset.formatSwap(anaconda.rootPath) - anaconda.id.fsset.turnOnSwap(anaconda.rootPath) - - return - class Partitions: """Defines all of the partition requests and delete requests.""" |