summaryrefslogtreecommitdiffstats
path: root/dispatch.py
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>2001-06-27 05:42:56 +0000
committerMatt Wilson <msw@redhat.com>2001-06-27 05:42:56 +0000
commitfc15931a2c397bdd7c4168187601f6fdfc06c335 (patch)
treeca2c2b7f072ad514075f00c18e0a89c6408cb7d8 /dispatch.py
parentc160284ab50cd4e4311e8a8396f8c086f6022603 (diff)
downloadanaconda-fc15931a2c397bdd7c4168187601f6fdfc06c335.tar.gz
anaconda-fc15931a2c397bdd7c4168187601f6fdfc06c335.tar.xz
anaconda-fc15931a2c397bdd7c4168187601f6fdfc06c335.zip
move upgrade mounting code into generic function, split bootloader init away from what ever the heck is going on with getting the partition requests set up
Diffstat (limited to 'dispatch.py')
-rw-r--r--dispatch.py7
1 files changed, 6 insertions, 1 deletions
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") ),