iutil.getArch now returns s390 for s390x, clean up to handle this nicely

12 files changed, 28 insertions, 30 deletions

diff --git a/anaconda b/anaconda
index eba39a9bb..d96fe00b2 100755
--- a/anaconda
+++ b/anaconda
@@ -213,7 +213,7 @@ for n in args:
 	display_mode = 't'
     elif (str == '-x' or str == '--xmode'):
 	xmode = 1
-    elif iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+    elif iutil.getArch() == "s390":
         logFile = "/tmp/anaconda-s390.log"
 
 #
@@ -251,7 +251,7 @@ if (debug):
 
 # don't let folks do anything stupid on !s390
 if (not flags.test and os.getpid() > 90 and flags.setupFilesystems and
-    not (iutil.getArch() == "s390" or iutil.getArch() == "s390x")):
+    not iutil.getArch() == "s390"):
     sys.stderr.write(
         "You're running me on a live system! that's incredibly stupid.\n")
     sys.exit(1)
@@ -420,7 +420,7 @@ if (display_mode != 't' and method and
     time.sleep(2)
 
 # XXX should be fixed to be more generic instead of just ifarching
-if iutil.getArch() != "s390" and iutil.getArch() != "s390x":
+if iutil.getArch() != "s390":
     # if no mouse we force text mode
     mousedev = mousehw.get()
     if display_mode != 't' and mousedev[0] == "None - None":
@@ -474,7 +474,7 @@ elif progmode != 'reconfig':
     import xf86config
 
     # only probe X related stuff if we're doing an install
-    if iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+    if iutil.getArch() == "s390":
         # XXX why doesn't videohw.primaryCard() dtrt on s390?
         card = videocard.VideoCard()
     else:
diff --git a/bootloader.py b/bootloader.py
index 2dabd5a03..c9f6fee07 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -76,7 +76,7 @@ class KernelArguments:
     def __init__(self):
         str = ""
 
-	if iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+        if iutil.getArch() == "s390":
 	    if os.environ.has_key("DASD"):
                 str = str + "dasd=" + os.environ["DASD"]
 
@@ -1032,7 +1032,7 @@ def getBootloader():
         return x86BootloaderInfo()
     elif iutil.getArch() == 'ia64':
         return ia64BootloaderInfo()
-    elif iutil.getArch() == 's390' or iutil.getArch() == "s390x":
+    elif iutil.getArch() == 's390':
         return s390BootloaderInfo()
     else:
         return bootloaderInfo()
diff --git a/fsset.py b/fsset.py
index 341fb4e2b..2912b3047 100644
--- a/fsset.py
+++ b/fsset.py
@@ -36,7 +36,7 @@ else:
 fileSystemTypes = {}
 
 # XXX define availraidlevels and defaultmntpts as arch characteristics
-if (iutil.getArch() != "s390" and iutil.getArch() != "s390x"):
+if iutil.getArch() != "s390":
     availRaidLevels = ['RAID0', 'RAID1', 'RAID5']
 else:    
     availRaidLevels = ['RAID0', 'RAID5']
diff --git a/gettext_rh.py b/gettext_rh.py
index b8969b1fa..49ee4e3dd 100644
--- a/gettext_rh.py
+++ b/gettext_rh.py
@@ -82,7 +82,7 @@ if os.environ.has_key('PY_XGETTEXT'):
 else:
 	xgettext = None
 
-if iutil.getArch() == 'sparc' or iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+if iutil.getArch() == 'sparc' or iutil.getArch() == "s390":
 	_gettext_byteorder = 'msb'
 else:
 	_gettext_byteorder = 'lsb'
diff --git a/gui.py b/gui.py
index 6d245209e..e6ac3f3b5 100755
--- a/gui.py
+++ b/gui.py
@@ -71,7 +71,7 @@ stepToClass = {
 
 if iutil.getArch() == 'sparc':
     stepToClass["bootloader"] = ("silo_gui", "SiloWindow")
-elif iutil.getArch() == 's390' or iutil.getArch() == 's390x':
+elif iutil.getArch() == 's390':
     stepToClass["bootloader"] = ("zipl_gui", "ZiplWindow")
 else:
     stepToClass["bootloader"] = ("bootloader_gui", "BootloaderWindow")
diff --git a/iutil.py b/iutil.py
index b1c0a3bd6..738dd77f2 100644
--- a/iutil.py
+++ b/iutil.py
@@ -33,6 +33,9 @@ def getArch ():
     if arch == "sparc64":
         arch = "sparc"
 
+    if arch == "s390x":
+        arch = "s390"
+
     return arch
 
 def getfd(filespec, readOnly = 0):
diff --git a/iw/partition_gui.py b/iw/partition_gui.py
index 0e6e2a3eb..c7249d9ef 100644
--- a/iw/partition_gui.py
+++ b/iw/partition_gui.py
@@ -1387,8 +1387,7 @@ class PartitionWindow(InstallWindow):
     def deleteCb(self, widget):
         partition = self.tree.getCurrentPartition()
 
-        if (iutil.getArch() == "s390" or iutil.getArch() == "s390x") \
-           and type(partition) != type("RAID"):
+        if iutil.getArch() == "s390" and type(partition) != type("RAID"):
             self.intf.messageWindow(_("Error"),
                                     _("DASD partitions can only be deleted with fdasd"))
             return
@@ -1454,7 +1453,7 @@ class PartitionWindow(InstallWindow):
             if type == "RAID":
                 self.editRaidRequest(request)
             elif type == "NEW":
-                if iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+                if iutil.getArch() == "s390":
                     self.intf.messageWindow(_("Error"),
                         _("You must go back and use fdasd to inititalize this partition"))
                 else:
@@ -1664,7 +1663,7 @@ class PartitionWindow(InstallWindow):
         buttonBox = gtk.HButtonBox()
         buttonBox.set_layout(gtk.BUTTONBOX_SPREAD)
 
-	if iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+        if iutil.getArch() == "s390":
             ops = ((_("_Edit"), self.editCb),
                    (_("_Delete"), self.deleteCb),
                    (_("_Reset"), self.resetCb),
diff --git a/packages.py b/packages.py
index f6a788aa5..a5d86328b 100644
--- a/packages.py
+++ b/packages.py
@@ -365,7 +365,7 @@ def doPreInstall(method, id, intf, instPath, dir):
     if not upgrade:
 	# this is NICE and LATE. It lets kickstart/server/workstation
 	# installs detect this properly
-	if arch == "s390" or arch == "s390x":
+        if arch == "s390":
 	    if (string.find(os.uname()[2], "tape") > -1):
 		select(id.hdList, 'kernel-tape')
 	    else:
@@ -405,7 +405,7 @@ def doPreInstall(method, id, intf, instPath, dir):
         if pcmcia.pcicType():
             select(id.hdList, 'kernel-pcmcia-cs')
 
-        if iutil.getArch() != "s390" and iutil.getArch() != "s390x":
+        if iutil.getArch() != "s390":
             xserver = id.videocard.primaryCard().getXServer()
             if (xserver and id.comps.packages.has_key('XFree86')
                 and id.comps.packages['XFree86'].selected
@@ -712,7 +712,7 @@ def doPostInstall(method, id, intf, instPath):
 	    # XXX currently Bad Things (X async reply) happen when doing
 	    # Mouse Magic on Sparc (Mach64, specificly)
 	    # The s390 doesn't even have a mouse!
-	    if os.environ.has_key ("DISPLAY") and not (arch == "sparc" or arch == "s390" or arch == "s390x"):
+	    if os.environ.has_key ("DISPLAY") and not (arch == "sparc" or arch == "s390"):
 		import xmouse
 		try:
 		    mousedev = xmouse.get()[0]
@@ -729,7 +729,7 @@ def doPostInstall(method, id, intf, instPath):
 		except RuntimeError:
 		    pass
 
-	    if arch != "s390" and arch != "s390x":
+	    if arch != "s390":
                 unmountUSB = 0
                 try:
                     isys.mount('/usbdevfs', instPath+'/proc/bus/usb', 'usbdevfs')
diff --git a/partitioning.py b/partitioning.py
index 01f2d7c3e..753d4efd9 100644
--- a/partitioning.py
+++ b/partitioning.py
@@ -689,8 +689,6 @@ def getDefaultDiskType():
         return parted.disk_type_get("GPT")
     elif iutil.getArch() == "s390":
         return parted.disk_type_get("dasd")
-    elif iutil.getArch() == "s390x":
-        return parted.disk_type_get("dasd")
     else:
         # XXX fix me for alpha at least
         return parted.disk_type_get("msdos")
@@ -698,7 +696,6 @@ def getDefaultDiskType():
 archLabels = {'i386': ['msdos'],
               'alpha': ['bsd'],
               's390': ['dasd'],
-              's390x': ['dasd'],
               'ia64': ['msdos', 'GPT']}
 
 def checkDiskLabel(disk, intf):
@@ -1533,7 +1530,7 @@ class DiskSet:
                         recreate = 1
 
                 if recreate == 1 and not flags.test:
-                    if iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+                    if iutil.getArch() == "s390":
                         if (self.dasdFmt(intf, drive)):
                             DiskSet.skippedDisks.append(drive)
                             continue
@@ -1556,7 +1553,7 @@ class DiskSet:
                 DiskSet.skippedDisks.append(drive)
                 continue
             elif ret == -1:
-                if iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+                if iutil.getArch() == "s390":
                     if (self.dasdFmt(intf, drive)):
                         DiskSet.skippedDisks.append(drive)
                         continue                    
@@ -1636,7 +1633,7 @@ def checkNoDisks(diskset, intf):
         sys.exit(0)
 
 def partitionObjectsInitialize(diskset, partitions, dir, intf):
-    if iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+    if iutil.getArch() == "s390":
         partitions.useAutopartitioning = 0
         partitions.useFdisk = 1
             
@@ -1672,7 +1669,7 @@ def partitionMethodSetup(partitions, dispatch):
                       skip = not partitions.useAutopartitioning)
     dispatch.skipStep("autopartitionexecute",
                       skip = not partitions.useAutopartitioning)
-    if iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+    if iutil.getArch() == "s390":
         dispatch.skipStep("fdasd", skip = not partitions.useFdisk)
     else:
         dispatch.skipStep("fdisk", skip = not partitions.useFdisk)
diff --git a/text.py b/text.py
index 4b56706b3..5b18e839d 100644
--- a/text.py
+++ b/text.py
@@ -81,7 +81,7 @@ if iutil.getArch() == 'sparc':
     stepToClasses["bootloader"] = ("silo_text", ("SiloAppendWindow",
                                                  "SiloWindow"
                                                  "SiloImagesWindow"))
-if iutil.getArch() == 's390' or iutil.getArch() == 's390x':
+if iutil.getArch() == 's390':
     stepToClasses["bootloader"] = ("zipl_text", ( "ZiplWindow"))
 
 class InstallWindow:
diff --git a/textw/complete_text.py b/textw/complete_text.py
index 0eb52b460..3d778130e 100644
--- a/textw/complete_text.py
+++ b/textw/complete_text.py
@@ -30,7 +30,7 @@ class FinishedWindow:
         else:
           bootstr = ""
 
-        if iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+        if iutil.getArch() == "s390":
           floppystr = ""
         else:
           floppystr = _("Remove any floppy diskettes you used during the "
diff --git a/textw/partition_text.py b/textw/partition_text.py
index 6688a72bf..d5205032f 100644
--- a/textw/partition_text.py
+++ b/textw/partition_text.py
@@ -943,7 +943,7 @@ class PartitionWindow:
             if type == "RAID":
                 self.editRaidRequest(request)
             elif type == "NEW":
-                if iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+                if iutil.getArch() == "s390":
                     self.intf.messageWindow(_("Error"),
                         _("You must go back and use fdasd to initialize this partition"))
                 else:
@@ -954,8 +954,7 @@ class PartitionWindow:
     def deleteCb(self):
         partition = self.lb.current()
 
-        if (iutil.getArch() == "s390" or iutil.getArch() == "s390x") \
-           and type(partition) != type("RAID"):
+        if iutil.getArch() == "s390" and type(partition) != type("RAID"):
             self.intf.messageWindow(_("Error"),
                                     _("DASD partitions can only be deleted with fdasd"))
             return
@@ -997,7 +996,7 @@ class PartitionWindow:
                            col_label_align=[CENTER, CENTER,CENTER,CENTER,CENTER,CENTER])
         self.g.add(self.lb, 0, 1)
 
-	if iutil.getArch() == "s390" or iutil.getArch() == "s390x":
+        if iutil.getArch() == "s390":
             self.bb = ButtonBar (screen, ((_("Edit"), "edit", "F3"),
                                           (_("Delete"), "delete", "F4"),
                                           (_("RAID"), "raid", "F11"),