2005-09-12 Jeremy Katz <katzj@redhat.com>

	* partitioning.py (partitionMethodSetup): Remove dead step code.
	(partitionObjectsInitialize): Set protected parts here.
	* dispatch.py (installSteps): Likewise.

	* installclass.py (BaseInstallClass.setSteps): More dead step nuking.

4 files changed, 17 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 0f86402db..7951a8b74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-09-12  Jeremy Katz  <katzj@redhat.com>
+
+	* partitioning.py (partitionMethodSetup): Remove dead step code.
+	(partitionObjectsInitialize): Set protected parts here.
+	* dispatch.py (installSteps): Likewise.
+
+	* installclass.py (BaseInstallClass.setSteps): More dead step nuking.
+
+	* iw/xconfig_gui.py: Remove dead code.
+	* textw/xconfig_text.py: Likewise.
+	* iw/bootdisk_gui.py: Likewise.
+	* iw/bootdisk_text.py: Likewise.
+
 2005-09-12  Chris Lumens  <clumens@redhat.com>
 
 	* anaconda:  Move special PPC display stuff into rhpl functions.
diff --git a/dispatch.py b/dispatch.py
index e0851c0a6..0b9ff1fd7 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -29,7 +29,7 @@ from packages import selectLanguageSupportGroups
 from packages import setupTimezone
 from packages import setFileCons
 from packages import fixupConditionals
-from partitioning import partitionMethodSetup, partitionObjectsInitialize
+from partitioning import partitionObjectsInitialize
 from partitioning import partitioningComplete
 from floppy import makeBootdisk
 from bootloader import writeBootloader, bootloaderSetupChoices
@@ -69,7 +69,8 @@ installSteps = [
     ("zfcpconfig", ("id.zfcp", "id.diskset", "intf")),
     ("partitionobjinit", partitionObjectsInitialize, ("id.diskset",
                                                       "id.partitions",
-                                                      "dir", "intf")),
+                                                      "dir", "intf",
+                                                      "dispatch")),
     ("parttype", ("id.diskset", "id.partitions", "intf", "dispatch")),    
     ("autopartitionexecute", doAutoPartition, ("dir", "id.diskset",
                                                "id.partitions", "intf",
diff --git a/installclass.py b/installclass.py
index 8f2543bff..e41450f84 100644
--- a/installclass.py
+++ b/installclass.py
@@ -128,7 +128,6 @@ class BaseInstallClass:
                  "parttype",
                  "autopartition",
                  "autopartitionexecute",
-                 "fdisk",
                  "partition",
 		 "partitiondone",
 		 "bootloadersetup",                 
diff --git a/partitioning.py b/partitioning.py
index bdcdb484c..169313e07 100644
--- a/partitioning.py
+++ b/partitioning.py
@@ -37,7 +37,7 @@ import partRequests
 
 from rhpl.translate import _
 
-def partitionObjectsInitialize(diskset, partitions, dir, intf):
+def partitionObjectsInitialize(diskset, partitions, dir, intf, dispatch):
     if dir == DISPATCH_BACK:
         diskset.closeDevices()
         isys.flushDriveDict()
@@ -50,26 +50,8 @@ def partitionObjectsInitialize(diskset, partitions, dir, intf):
     diskset.checkNoDisks(intf)
 
     partitions.setFromDisk(diskset)
-
-def partitionMethodSetup(partitions, dispatch):
-
-    # turn on/off step based on 3 paths:
-    #  - use fdisk, then set mount points
-    #  - use autopartitioning, then set mount points
-    #  - use interactive partitioning tool, continue
-
-    dispatch.skipStep("autopartition",
-                      skip = not partitions.useAutopartitioning)
-    dispatch.skipStep("autopartitionexecute",
-                      skip = not partitions.useAutopartitioning)
-    if dispatch.stepInSkipList("partition") and not partitions.useAutopartitioning:
-	dispatch.skipStep("partition", skip = 0)
-    
-    dispatch.skipStep("fdisk", skip = not partitions.useFdisk)
-
     partitions.setProtected(dispatch)
 
-    
 def partitioningComplete(bl, fsset, diskSet, partitions, intf, instPath, dir):
     if dir == DISPATCH_BACK and fsset.isActive():
         rc = intf.messageWindow(_("Installation cannot continue."),