Finish making non-UI steps pass around the anaconda object.

1 files changed, 22 insertions, 33 deletions

diff --git a/dispatch.py b/dispatch.py
index 180f46e2b..ce278c059 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -74,52 +74,41 @@ installSteps = [
     ("upgradeswapsuggestion", upgradeSwapSuggestion, ("anaconda",)),
     ("addswap", ("intf", "id.fsset", "instPath",
                  "id.upgradeSwapInfo", "dispatch")),
-    ("partitiondone", partitioningComplete, ("id.bootloader", "id.fsset",
-                                             "id.diskset", "id.partitions",
-                                             "intf", "instPath", "dir")),
-    ("upgrademigfind", upgradeMigrateFind, ("dispatch", "id.fsset")),
+    ("partitiondone", partitioningComplete, ("anaconda",)),
+    ("upgrademigfind", upgradeMigrateFind, ("anaconda",)),
     ("upgrademigratefs",  ("id.fsset",)),
     ("upgbootloader", ("dispatch", "id.bootloader")),
-    ("bootloadersetup", bootloaderSetupChoices, ("dispatch", "id.bootloader",
-                                                 "id.fsset", "id.diskset",
-                                                 "dir")),
+    ("bootloadersetup", bootloaderSetupChoices, ("anaconda",)),
     ("bootloader", ("dispatch", "id.bootloader", "id.fsset", "id.diskset")),
     ("bootloaderadvanced", ("dispatch", "id.bootloader", "id.fsset",
                             "id.diskset")),
-    ("networkdevicecheck", networkDeviceCheck, ("id.network", "dispatch")),
+    ("networkdevicecheck", networkDeviceCheck, ("anaconda",)),
     ("network", ("id.network", "dir", "intf", "id")),
     ("timezone", ("id.instLanguage", "id.timezone")),
     ("accounts", ("intf", "id.rootPassword")),
-    ("reposetup", doRepoSetup, ("backend","intf", "id", "instPath")),
-    ("basepkgsel", doBasePackageSelect, ("backend","id.instClass", "intf")),
+    ("reposetup", doRepoSetup, ("anaconda",)),
+    ("basepkgsel", doBasePackageSelect, ("anaconda",)),
     ("tasksel", ("intf", "backend", "dispatch", "id.instClass")),   
     ("group-selection", ("backend", "intf")),
-    ("postselection", doPostSelection, ("backend", "intf", "id", "instPath", "dir")),
+    ("postselection", doPostSelection, ("anaconda",)),
     ("confirminstall", ("intf", "id",)),
     ("confirmupgrade", ("intf", "id",)),
     ("install", ("dir", "intf", "id")),
-    ("enablefilesystems", turnOnFilesystems, ("dir", "id.fsset",
-                                              "id.diskset", "id.partitions",
-                                              "id.upgrade", "instPath")),
-    ("migratefilesystems", doMigrateFilesystems, ("dir", "id.fsset",
-                                              "id.diskset", "id.upgrade",
-                                              "instPath")),
-    ("setuptime", setupTimezone, ("id.timezone", "id.upgrade", "instPath",
-                                  "dir")),
-    ("preinstallconfig", doPreInstall, ("backend", "intf", "id", "instPath", "dir")),
-    ("installpackages", doInstall, ("backend", "intf", "id", "instPath")),
-    ("postinstallconfig", doPostInstall, ("backend", "intf", "id", "instPath")),    
-    ("writeconfig", writeConfiguration, ("backend", "id", "instPath")),
-    ("firstboot", firstbootConfiguration, ("id", "instPath")),
-    ("instbootloader", writeBootloader, ("intf", "instPath", "id.fsset", 
-                                         "id.bootloader", "id.instLanguage",
-                                         "backend")),
-    ("writexconfig", writeXConfiguration, ("id", "instPath")),
-    ("writeksconfig", writeKSConfiguration, ("id", "instPath")),
-    ("setfilecon", setFileCons, ("instPath","id.partitions")),
-    ("copylogs", copyAnacondaLogs, ("instPath",)),
-    ("dopostaction", doPostAction, ("id", "instPath", "intf")),
-    ("methodcomplete", doMethodComplete, ("method", "id.fsset")),
+    ("enablefilesystems", turnOnFilesystems, ("anaconda",)),
+    ("migratefilesystems", doMigrateFilesystems, ("anaconda",)),
+    ("setuptime", setupTimezone, ("anaconda",)),
+    ("preinstallconfig", doPreInstall, ("anaconda",)),
+    ("installpackages", doInstall, ("anaconda",)),
+    ("postinstallconfig", doPostInstall, ("anaconda",)),
+    ("writeconfig", writeConfiguration, ("anaconda",)),
+    ("firstboot", firstbootConfiguration, ("anaconda",)),
+    ("instbootloader", writeBootloader, ("anaconda",)),
+    ("writexconfig", writeXConfiguration, ("anaconda",)),
+    ("writeksconfig", writeKSConfiguration, ("anaconda",)),
+    ("setfilecon", setFileCons, ("anaconda",)),
+    ("copylogs", copyAnacondaLogs, ("anaconda",)),
+    ("dopostaction", doPostAction, ("anaconda",)),
+    ("methodcomplete", doMethodComplete, ("anaconda",)),
     ("complete", ()),
     ]