whee! merge the first bunch of changes from the 390 branch. this

incorporates most of the python changes as well as the isys changes.

email with what hasn't been applied coming later after I either finish merging
the rest or decide to stop for the night

1 files changed, 24 insertions, 16 deletions

diff --git a/installclass.py b/installclass.py
index c835eb8d3..1e7065fb1 100644
--- a/installclass.py
+++ b/installclass.py
@@ -77,6 +77,7 @@ class BaseInstallClass:
                  "autopartition",
                  "autopartitionexecute",
                  "fdisk",
+                 "fdasd",
                  "partition",
 		 "partitiondone",
 		 "bootloadersetup",                 
@@ -113,26 +114,33 @@ class BaseInstallClass:
 		 "complete"
 		)
 
+        # XXX ugh, this badly needs some clean up
         if iutil.getArch() == "alpha" or iutil.getArch() == "ia64":
 	    dispatch.skipStep("bootdisk")
             dispatch.skipStep("bootloader")
             dispatch.skipStep("bootloaderpassword")
-
-	if iutil.getArch() == "s390" or iutil.getArch() == "s390x":
-	    dispatch.skipStep("bootdisk")
-	    dispatch.skipStep("lilo")
-	    dispatch.skipStep("partition")
-	    dispatch.skipStep("format")
-	    dispatch.skipStep("mouse")
-	    dispatch.skipStep("network")
-	    dispatch.skipStep("firewall")
-	    dispatch.skipStep("authentication")
-	    # dispatch.skipStep("accounts")
-	    dispatch.skipStep("language")
-	    dispatch.skipStep("keyboard")
-	    dispatch.skipStep("xconfig")
-	    dispatch.skipStep("lba32warning")
-
+            dispatch.skipStep("fdasd", permanent = 1)
+        elif iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+	    #dispatch.skipStep("language")
+	    dispatch.skipStep("keyboard", permanent = 1)
+	    dispatch.skipStep("mouse", permanent = 1)
+
+            dispatch.skipStep("partitionmethod", permanent = 1)
+            dispatch.skipStep("autopartition", permanent = 1)
+            dispatch.skipStep("autopartitionexecute", permanent = 1)
+            dispatch.skipStep("fdisk", permanent = 1)
+            dispatch.skipStep("bootloaderpassword",  permanent = 1)
+
+	    dispatch.skipStep("handleX11pkgs", permanent = 1)
+	    dispatch.skipStep("videocard", permanent = 1)
+	    dispatch.skipStep("monitor", permanent = 1)
+	    dispatch.skipStep("xcustom", permanent = 1)
+	    dispatch.skipStep("writexconfig", permanent = 1)
+            
+            dispatch.skipStep("bootdisk", permanent = 1)
+        else:
+            dispatch.skipStep("fdasd", permanent = 1)
+            
     # This is called after the hdlist is read in.
     def setPackageSelection(self, hdlist):
 	pass