Get ready for a surprise...

not really.  It's just iutil.getArch() -> rhpl.getArch() updates.

19 files changed, 98 insertions, 62 deletions

diff --git a/ChangeLog b/ChangeLog
index e449e938b..9cecfcd10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,25 @@
 	* iutil.py:  Change isys.mknod to os.mknod.  Change isys.makedev to
 	os.makedev.
 
+	* anaconda: Changed iutil.getArch() to rhpl.getArch().
+	* autopart.py: Likewise.
+	* bootloader.py: Likewise.
+	* exception.py: Likewise.
+	* fsset.py: Likewise. Also fix typo 'resierfs' -> 'reiserfs'.
+	* gui.py: Likewise.
+	* image.py: Likewise.
+	* installclass.py: Likewise.
+	* iutil.py: Likewise.
+	* network.py: Likewise.
+	* packages.py: Likewise.
+	* partedUtils.py: Likewise.
+	* partitions.py: Likewise.
+	* text.py: Likewise.
+	* upgrade.py: Likewise.
+	* upgradeclass.py: Likewise.
+	* xsetup.py: Likewise.
+	* yuminstall.py: Likewise.
+
 2006-03-24  Peter Jones  <pjones@redhat.com>
 
 	* Makefile.inc: Fix selinux conditional inclusion.
diff --git a/anaconda b/anaconda
index 8a2d7c809..e2b010ee3 100755
--- a/anaconda
+++ b/anaconda
@@ -377,10 +377,11 @@ import signal, traceback, string, isys, iutil, time
 from exception import handleException
 import dispatch
 import warnings
+import rhpl
 from flags import flags
 from rhpl.translate import _, textdomain, addPoPath
 
-if iutil.getArch() != "s390" and os.access("/dev/tty3", os.W_OK):
+if rhpl.getArch() != "s390" and os.access("/dev/tty3", os.W_OK):
     logger.addFileHandler ("/dev/tty3", log)
 
 warnings.showwarning = AnacondaShowWarning
@@ -575,7 +576,7 @@ if opts.vncconnect:
 	    vncconnectport = cargs[1]
 
 # probing for hardware on an s390 seems silly...
-if iutil.getArch() == "s390":
+if rhpl.getArch() == "s390":
     opts.isHeadless = True
 
 #
@@ -670,7 +671,7 @@ if opts.debug:
 # let people be stupid
 ## # 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"):
+##     not rhpl.getArch() == "s390"):
 ##     sys.stderr.write(
 ##         "You're running me on a live system! that's incredibly stupid.\n")
 ##     sys.exit(1)
@@ -803,7 +804,7 @@ time.sleep(3)
 # now determine if we're going to run in GUI or TUI mode
 #
 # if no X server, we have to use text mode
-if not (flags.test or flags.rootpath) and (iutil.getArch() != "s390" and not os.access("/mnt/runtime/usr/bin/Xorg", os.X_OK)):
+if not (flags.test or flags.rootpath) and (rhpl.getArch() != "s390" and not os.access("/mnt/runtime/usr/bin/Xorg", os.X_OK)):
      stdoutLog.warning(_("Graphical installation not available...  "
 			 "Starting text mode."))
      time.sleep(2)
diff --git a/autopart.py b/autopart.py
index 39c18dc18..5d91ea50a 100644
--- a/autopart.py
+++ b/autopart.py
@@ -20,6 +20,7 @@ import string, sys
 import fsset
 import lvm
 import logging
+import rhpl
 from anaconda_log import logger, logFile
 from partitioning import *
 import partedUtils
@@ -69,15 +70,15 @@ def bootRequestCheck(requests, diskset):
         return PARTITION_SUCCESS
 
     
-    if iutil.getArch() == "ia64":
+    if rhpl.getArch() == "ia64":
         if (part.fs_type.name != "FAT" and part.fs_type.name != "fat16"
             and part.fs_type.name != "fat32"):
             return BOOTEFI_NOT_VFAT
         pass
-    elif iutil.getArch() == "i386":
+    elif rhpl.getArch() == "i386":
         if partedUtils.end_sector_to_cyl(part.geom.dev, part.geom.end) >= 1024:
             return BOOT_ABOVE_1024
-    elif iutil.getArch() == "alpha":
+    elif rhpl.getArch() == "alpha":
         return bootAlphaCheckRequirements(part, diskset)
     elif (iutil.getPPCMachine() == "pSeries" or
           iutil.getPPCMachine() == "iSeries"):
@@ -1147,7 +1148,7 @@ def doClearPartAction(partitions, diskset):
             # bootable flag set, do not delete it and make it our
             # /boot/efi as it could contain system utils.
             # doesn't apply on kickstart installs or if no boot flag
-            if ((iutil.getArch() == "ia64") and (linuxOnly == 1)
+            if ((rhpl.getArch() == "ia64") and (linuxOnly == 1)
                 and (not partitions.isKickstart) and
                 part.is_flag_available(parted.PARTITION_BOOT)):
                 if part.fs_type and (part.fs_type.name == "FAT"
@@ -1636,7 +1637,7 @@ def autoCreateLVMPartitionRequests(autoreq):
 
 def getAutopartitionBoot():
     """Return the proper shorthand for the boot dir (arch dependent)."""
-    if iutil.getArch() == "ia64":
+    if rhpl.getArch() == "ia64":
         return [ ("/boot/efi", "vfat", 100, None, 0, 1, 0) ]
     elif (iutil.getPPCMachine() == "pSeries"):
         return [ (None, "PPC PReP Boot", 4, None, 0, 1, 0),
diff --git a/bootloader.py b/bootloader.py
index bd9f9f6e4..52cc0c8ad 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -22,6 +22,7 @@ import crypt
 import language
 import iutil
 import string
+import rhpl
 from flags import flags
 from constants import *
 
@@ -191,7 +192,7 @@ def writeBootloader(intf, instRoot, fsset, bl, langs, backend):
 # note that this function no longer actually creates an initrd.
 # the kernel's %post does this now
 def makeInitrd (kernelTag, instRoot):
-    if iutil.getArch() == 'ia64':
+    if rhpl.getArch() == 'ia64':
 	initrd = "/boot/efi/initrd%s.img" % (kernelTag, )
     else:
 	initrd = "/boot/initrd%s.img" % (kernelTag, )
diff --git a/exception.py b/exception.py
index 7ccdc8f52..b45928e10 100644
--- a/exception.py
+++ b/exception.py
@@ -23,6 +23,7 @@ import iutil
 import types
 import rpm
 import bdb
+import rhpl
 from string import joinfields
 from cPickle import Pickler
 from rhpl.translate import _
@@ -282,7 +283,7 @@ def copyExceptionToFloppy (intf, dispatch):
 
         os.close(fd)
 
-        if iutil.getArch() != "ia64":
+        if rhpl.getArch() != "ia64":
             args = [ 'mkdosfs', '/tmp/floppy' ]
             cmd = "/usr/sbin/mkdosfs"
 
diff --git a/fsset.py b/fsset.py
index 6b9e0115c..dec95d380 100644
--- a/fsset.py
+++ b/fsset.py
@@ -31,6 +31,7 @@ import lvm
 import types
 from flags import flags
 
+import rhpl
 from rhpl.translate import _, N_
 
 import logging
@@ -41,11 +42,11 @@ class BadBlocksError(Exception):
 
 defaultMountPoints = ['/', '/home', '/tmp', '/usr', '/var', '/usr/local', '/opt']
 
-if iutil.getArch() == "s390":
+if rhpl.getArch() == "s390":
     # Many s390 have 2G DASDs, we recomment putting /usr/share on its own DASD
     defaultMountPoints.insert(4, '/usr/share')
 
-if iutil.getArch() == "ia64":
+if rhpl.getArch() == "ia64":
     defaultMountPoints.insert(1, '/boot/efi')
 else:
     defaultMountPoints.insert(1, '/boot')
@@ -393,7 +394,7 @@ class reiserfsFileSystem(FileSystemType):
         # at the boot: prompt will let you make new reiserfs filesystems
         # in the installer.  Bugs filed when you use this will be closed
         # WONTFIX.
-        if flags.cmdline.has_key("resierfs"):
+        if flags.cmdline.has_key("reiserfs"):
             self.supported = -1
         else:
             self.supported = 0
@@ -762,7 +763,7 @@ class swapFileSystem(FileSystemType):
             if buf[pagesize - 10:] == "SWAP-SPACE":
                 log.warning("SWAP is of format 0, skipping it")
                 return
-        
+
         isys.swapon (device)
 
     def umount(self, device, path):
@@ -1318,7 +1319,7 @@ MAILADDR root
                     bestprep = entry
             if bestprep:
                 bootDev = bestprep.device
-        elif iutil.getArch() == "ia64":
+        elif rhpl.getArch() == "ia64":
             if mntDict.has_key("/boot/efi"):
                 bootDev = mntDict['/boot/efi']
 	elif mntDict.has_key("/boot"):
@@ -1372,7 +1373,7 @@ MAILADDR root
 
         # on ia64, *only* /boot/efi should be marked bootable
         # similarly, on pseries, we really only want the PReP partition active
-        if (iutil.getArch() == "ia64" or iutil.getPPCMachine() == "pSeries"
+        if (rhpl.getArch() == "ia64" or iutil.getPPCMachine() == "pSeries"
             or iutil.getPPCMachine() == "iSeries") or iutil.getPPCMachine() == "PMac":
             part = partedUtils.get_partition_by_name(diskset.disks, bootDev)
             if part and part.is_flag_available(parted.PARTITION_BOOT):
diff --git a/gui.py b/gui.py
index 1a961e6f9..c46164dff 100755
--- a/gui.py
+++ b/gui.py
@@ -41,6 +41,7 @@ from language import expandLangs
 from constants import *
 from network import hasActiveNetDev
 import floppy
+import rhpl
 
 from rhpl.translate import _, N_
 
@@ -80,7 +81,7 @@ stepToClass = {
     "complete" : ("congrats_gui", "CongratulationWindow"),
 }
 
-if iutil.getArch() == 's390':
+if rhpl.getArch() == 's390':
     stepToClass["bootloader"] = ("zipl_gui", "ZiplWindow")
 
 #
@@ -1503,7 +1504,7 @@ class InstallControlState:
         if self.htmlFile:
             file = self.htmlFile
 
-            arch = "-%s" % (iutil.getArch(),)
+            arch = "-%s" % (rhpl.getArch(),)
             tags = [ "%s" % (arch,), "" ]
 
             found = 0
diff --git a/image.py b/image.py
index 5c4664774..5809c7a1a 100644
--- a/image.py
+++ b/image.py
@@ -22,6 +22,7 @@ import kudzu
 import string
 import shutil
 import product
+import rhpl
 
 from constants import *
 
@@ -35,7 +36,7 @@ log = logging.getLogger("anaconda")
 if os.uname()[4] == "s390x":
     _arch = "s390x"
 else:
-    _arch = iutil.getArch()
+    _arch = rhpl.getArch()
 
 # given groupset containing information about selected packages, use
 # the disc number info in the headers to come up with message describing
diff --git a/installclass.py b/installclass.py
index 1399470d8..bdd7a7d83 100644
--- a/installclass.py
+++ b/installclass.py
@@ -17,6 +17,7 @@
 import os, sys, iutil
 import string
 import language
+import rhpl
 
 from instdata import InstallData
 from partitioning import *
@@ -162,10 +163,10 @@ class BaseInstallClass:
 	if not BETANAG:
 	    dispatch.skipStep("betanag", permanent=1)
 
-	if iutil.getArch() != "s390":
+	if rhpl.getArch() != "s390":
             dispatch.skipStep("zfcpconfig", permanent=1)
 
-        if iutil.getArch() != "i386" and iutil.getArch() != "x86_64":
+        if rhpl.getArch() != "i386" and rhpl.getArch() != "x86_64":
             dispatch.skipStep("bootloader", permanent=1)
 
         # allow install classes to turn off the upgrade 
@@ -520,7 +521,7 @@ def availableClasses(showHidden=0):
 		sortOrder = 0
 
 	    if obj.__dict__.has_key('arch'):
-                if obj.arch != iutil.getArch ():
+                if obj.arch != rhpl.getArch ():
                     obj.hidden = 1
                 
             if obj.hidden == 0 or showHidden == 1:
diff --git a/iutil.py b/iutil.py
index 0c115864f..69bbd8c8b 100644
--- a/iutil.py
+++ b/iutil.py
@@ -341,7 +341,7 @@ def makeDriveDeviceNodes():
     
 # this is disgusting and I feel very dirty
 def hasiSeriesNativeStorage():
-    if getArch() != "ppc":
+    if rhpl.getArch() != "ppc":
         return
 
     f = open("/proc/modules", "r")
@@ -359,7 +359,7 @@ def hasiSeriesNativeStorage():
 # return the ppc machine variety type
 def getPPCMachine():
     
-    if getArch() != "ppc":
+    if rhpl.getArch() != "ppc":
         return 0
     
     machine = rhpl.getPPCMachine()
@@ -374,7 +374,7 @@ def getPPCMachine():
 def getPPCMacID():
     machine = None
     
-    if getArch() != "ppc":
+    if rhpl.getArch() != "ppc":
         return 0
     if getPPCMachine() != "PMac":
         return 0
@@ -396,7 +396,7 @@ def getPPCMacGen():
     # XXX: should NuBus be here?
     pmacGen = ['OldWorld', 'NewWorld', 'NuBus']
     
-    if getArch() != "ppc":
+    if rhpl.getArch() != "ppc":
         return 0
     if getPPCMachine() != "PMac":
         return 0
@@ -422,7 +422,7 @@ def getPPCMacGen():
 
 # return if pmac machine is it an iBook/PowerBook
 def getPPCMacBook():
-    if getArch() != "ppc":
+    if rhpl.getArch() != "ppc":
         return 0
     if getPPCMachine() != "PMac":
         return 0
@@ -439,7 +439,7 @@ def getPPCMacBook():
 def hasNX():
     """Convenience function to see if a machine supports the nx bit. We want
     to install an smp kernel if NX is present since NX requires PAE (#173245)"""
-    if getArch() not in ("i386", "x86_64"):
+    if rhpl.getArch() not in ("i386", "x86_64"):
         return False
     f = open("/proc/cpuinfo", "r")
     lines = f.readlines()
diff --git a/network.py b/network.py
index 2c5e22ca0..92c9ee3ee 100644
--- a/network.py
+++ b/network.py
@@ -23,6 +23,7 @@ import socket
 import os
 import re
 import kudzu
+import rhpl
 from flags import flags
 
 from rhpl.translate import _, N_
@@ -279,7 +280,7 @@ class Network:
                 self.netdevices[dev] = NetworkDevice(dev)
             try:
                 hwaddr = isys.getMacAddress(dev)
-                if iutil.getArch() != "s390" and hwaddr and hwaddr != "00:00:00:00:00:00" and hwaddr != "ff:ff:ff:ff:ff:ff":
+                if rhpl.getArch() != "s390" and hwaddr and hwaddr != "00:00:00:00:00:00" and hwaddr != "ff:ff:ff:ff:ff:ff":
                     self.netdevices[dev].set(("hwaddr", hwaddr))
             except Exception, e:
                 log.error("exception getting mac addr: %s" %(e,))
diff --git a/packages.py b/packages.py
index dcd6801ad..48c8056d5 100644
--- a/packages.py
+++ b/packages.py
@@ -32,6 +32,7 @@ from constants import *
 from syslogd import syslog
 from installmethod import FileCopyException
 
+import rhpl
 from rhpl.translate import _
 import rhpl.arch
 
@@ -178,7 +179,7 @@ def setupTimezone(timezone, upgrade, instPath, dir):
         except OSError, (errno, msg):
             log.error("Error copying timezone (from %s): %s" %(tzfile, msg))
 
-    if iutil.getArch() == "s390":
+    if rhpl.getArch() == "s390":
         return
     args = [ "/usr/sbin/hwclock", "--hctosys" ]
     if timezone.utc:
diff --git a/partedUtils.py b/partedUtils.py
index 799d1c16f..8e9dc181c 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -25,7 +25,8 @@ from product import *
 import fsset
 import iutil, isys
 import raid
-if not iutil.getArch() in ('s390','s390x'):
+import rhpl
+if not rhpl.getArch() in ('s390','s390x'):
     import dmraid
     import block
 import lvm
@@ -245,21 +246,21 @@ def get_lvm_partitions(disk):
 
 def getDefaultDiskType():
     """Get the default partition table type for this architecture."""
-    if iutil.getArch() == "i386":
+    if rhpl.getArch() == "i386":
         return parted.disk_type_get("msdos")
-    elif iutil.getArch() == "ia64":
+    elif rhpl.getArch() == "ia64":
         return parted.disk_type_get("gpt")
-    elif iutil.getArch() == "s390":
+    elif rhpl.getArch() == "s390":
         # the "default" type is dasd, but we don't really do dasd
         # formatting with parted and use dasdfmt directly for them
         # so if we get here, it's an fcp disk and we should write
         # an msdos partition table (#144199)
         return parted.disk_type_get("msdos")
-    elif iutil.getArch() == "alpha":
+    elif rhpl.getArch() == "alpha":
         return parted.disk_type_get("bsd")
-    elif iutil.getArch() == "sparc":
+    elif rhpl.getArch() == "sparc":
         return parted.disk_type_get("sun")
-    elif iutil.getArch() == "ppc":
+    elif rhpl.getArch() == "ppc":
         ppcMachine = iutil.getPPCMachine()
 
         if ppcMachine == "PMac":
@@ -282,7 +283,7 @@ archLabels = {'i386': ['msdos'],
 # this is kind of crappy, but we don't really want to allow LDL formatted
 # dasd to be used during the install
 def checkDasdFmt(disk, intf):
-    if iutil.getArch() != "s390":
+    if rhpl.getArch() != "s390":
         return 0
 
     if disk.type.name != "dasd":
@@ -321,7 +322,7 @@ def checkDasdFmt(disk, intf):
 
 def checkDiskLabel(disk, intf):
     """Check that the disk label on disk is valid for this machine type."""
-    arch = iutil.getArch()
+    arch = rhpl.getArch()
     if arch in archLabels.keys():
         if disk.type.name in archLabels[arch]:
             # this is kind of a hack since we don't want LDL to be used
@@ -575,7 +576,7 @@ class DiskSet:
         """Start all of the raid devices associated with the DiskSet."""
         testList = DiskSet.skippedDisks
 
-        if not iutil.getArch() in ('s390','s390x'):
+        if not rhpl.getArch() in ('s390','s390x'):
             if self.dmList is None:
                 self.startDmRaid()
             for rs in DiskSet.dmList or []:
@@ -885,7 +886,7 @@ class DiskSet:
         """Open the disks on the system and skip unopenable devices."""
         if self.disks:
             return
-        if not iutil.getArch() in ("s390", "s390x"):
+        if not rhpl.getArch() in ("s390", "s390x"):
             if DiskSet.dmList is None:
                 log.debug("starting dmraids")
                 self.startDmRaid()
@@ -901,7 +902,7 @@ class DiskSet:
                 DiskSet.skippedDisks.append(drive)
                 continue
             # FIXME: need the right fix for z/VM formatted dasd
-            if iutil.getArch() == "s390" and drive[:4] == "dasd" and isys.getDasdState(drive):
+            if rhpl.getArch() == "s390" and drive[:4] == "dasd" and isys.getDasdState(drive):
                 devs = isys.getDasdDevPort()
                 if intf is None:
                     DiskSet.skippedDisks.append(drive)
@@ -932,7 +933,7 @@ class DiskSet:
             
             if (initAll and ((clearDevs is None) or (len(clearDevs) == 0)
                              or drive in clearDevs) and not flags.test):
-                if iutil.getArch() == "s390" and drive[:4] == "dasd":
+                if rhpl.getArch() == "s390" and drive[:4] == "dasd":
                     if (intf is None or self.dasdFmt(intf, drive)):
                         DiskSet.skippedDisks.append(drive)
                         continue                    
@@ -958,7 +959,7 @@ class DiskSet:
                     DiskSet.skippedDisks.append(drive)
                     continue
                 else:
-                    if iutil.getArch() == "s390" and drive[:4] == "dasd":
+                    if rhpl.getArch() == "s390" and drive[:4] == "dasd":
                          devs = isys.getDasdDevPort()
                          format = drive + " (" + devs[drive] + ")"
                     else:
@@ -980,7 +981,7 @@ class DiskSet:
                         recreate = 1
 
                 if recreate == 1 and not flags.test:
-                    if iutil.getArch() == "s390" and drive[:4] == "dasd":
+                    if rhpl.getArch() == "s390" and drive[:4] == "dasd":
                         if (intf is None or self.dasdFmt(intf, drive)):
                             DiskSet.skippedDisks.append(drive)
                             continue
@@ -1006,7 +1007,7 @@ class DiskSet:
                 DiskSet.skippedDisks.append(drive)
                 continue
             elif ret == -1:
-                if iutil.getArch() == "s390" and drive[:4] == "dasd":
+                if rhpl.getArch() == "s390" and drive[:4] == "dasd":
                     if (intf is None or self.dasdFmt(intf, drive)):
                         DiskSet.skippedDisks.append(drive)
                         continue                    
diff --git a/partitions.py b/partitions.py
index 4ad038578..0729e0786 100644
--- a/partitions.py
+++ b/partitions.py
@@ -31,6 +31,7 @@ import lvm
 import partedUtils
 import partRequests
 
+import rhpl
 from rhpl.translate import _
 
 import logging
@@ -612,7 +613,7 @@ class Partitions:
         """Return the name of the current 'boot' mount point."""
         bootreq = None
 
-        if iutil.getArch() == "ia64":
+        if rhpl.getArch() == "ia64":
             bootreq = self.getRequestByMountPoint("/boot/efi")
             if bootreq:
                 return [ bootreq ]
@@ -683,7 +684,7 @@ class Partitions:
         """Return a list of bootable valid mountpoints for this arch."""
         # FIXME: should be somewhere else, preferably some sort of arch object
 
-        if iutil.getArch() == "ia64":
+        if rhpl.getArch() == "ia64":
             return [ "/boot/efi" ]
         else:
             return [ "/boot", "/" ]
@@ -809,7 +810,7 @@ class Partitions:
                               "megabytes which is usually too small to "
                               "install %s.") % (productName,))
 
-        if iutil.getArch() == "ia64":
+        if rhpl.getArch() == "ia64":
             bootreq = self.getRequestByMountPoint("/boot/efi")
             if not bootreq or bootreq.getActualSize(self, diskset) < 50:
                 errors.append(_("You must create a /boot/efi partition of "
@@ -915,7 +916,7 @@ class Partitions:
                 # most arches can't have boot on RAID
                 if (bootreq and
                     (isinstance(bootreq, partRequests.RaidRequestSpec)) and
-                    (iutil.getArch() not in raid.raidBootArches)):
+                    (rhpl.getArch() not in raid.raidBootArches)):
                     errors.append("Bootable partitions cannot be on a RAID "
                                   "device.")
 
diff --git a/text.py b/text.py
index 0e0c01cfd..4b51b0ecf 100644
--- a/text.py
+++ b/text.py
@@ -31,6 +31,7 @@ from constants import *
 from network import hasActiveNetDev
 import floppy
 
+import rhpl
 from rhpl.translate import _, cat, N_
 
 import logging
@@ -70,7 +71,7 @@ stepToClasses = {
     "complete" : ("complete_text", "FinishedWindow"),
 }
 
-if iutil.getArch() == 's390':
+if rhpl.getArch() == 's390':
     stepToClasses["bootloader"] = ("zipl_text", ( "ZiplWindow"))
 
 class InstallWindow:
@@ -226,7 +227,7 @@ class InstallInterface:
 	try:
             f = None
 
-            arch = "-%s" % (iutil.getArch(),)
+            arch = "-%s" % (rhpl.getArch(),)
             tags = ["%s" % (arch,), "" ]
 
 	    # XXX
diff --git a/upgrade.py b/upgrade.py
index 86e0be140..738aec0a5 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -30,6 +30,7 @@ from constants import *
 from installmethod import FileCopyException
 from product import productName
 
+import rhpl
 from rhpl.translate import _
 
 import logging
@@ -39,7 +40,7 @@ log = logging.getLogger("anaconda")
 # (name, ) to erase all matches
 upgrade_remove_blacklist = [("system-config-mouse",), ("dev",)] 
 
-if iutil.getArch() == "x86_64":
+if rhpl.getArch() == "x86_64":
     upgrade_remove_blacklist.extend( [("perl","i386"), ("e2fsprogs", "i386")] )
 
 def findRootParts(intf, id, dispatch, dir, chroot):
diff --git a/upgradeclass.py b/upgradeclass.py
index a443f6f24..606dbf4cd 100644
--- a/upgradeclass.py
+++ b/upgradeclass.py
@@ -14,6 +14,7 @@ from rhpl.translate import N_, _
 
 import os
 import iutil
+import rhpl
 
 class InstallClass(BaseInstallClass):
     name = N_("Upgrade Existing System")
@@ -59,11 +60,11 @@ class InstallClass(BaseInstallClass):
 		    "complete"
 		)
 
-        if iutil.getArch() != "i386" and iutil.getArch() != "x86_64":
+        if rhpl.getArch() != "i386" and rhpl.getArch() != "x86_64":
             dispatch.skipStep("bootloader")
             dispatch.skipStep("bootloaderadvanced")
 
-        if iutil.getArch() != "i386" and iutil.getArch() != "x86_64":
+        if rhpl.getArch() != "i386" and rhpl.getArch() != "x86_64":
             dispatch.skipStep("upgbootloader")            
 
     def setInstallData(self, id):
diff --git a/xsetup.py b/xsetup.py
index 63caf599f..3afc185ac 100644
--- a/xsetup.py
+++ b/xsetup.py
@@ -17,6 +17,7 @@
 # should probably go in rhpl
 #
 import iutil
+import rhpl
 import rhpxl.xserver as xserver
 from rhpl.translate import _
 
@@ -36,7 +37,7 @@ class XSetup:
     #
     def write(self, fn, mouse, keyboard):
         # always turn dri on FIXME: except on ia64
-        if iutil.getArch() == "ia64":
+        if rhpl.getArch() == "ia64":
             self.xhwstate.set_dri_enabled(0)
         else:
             self.xhwstate.set_dri_enabled(1)
@@ -66,7 +67,7 @@ class XSetup:
     def writeKS(self, f, desktop=None):
         # FIXME: we really should have at least teh startxonboot and
         # defaultdesktop bits on s390
-        if iutil.getArch() == "s390":
+        if rhpl.getArch() == "s390":
             return
         
 	if self.skipx:
diff --git a/yuminstall.py b/yuminstall.py
index b3a83a86e..5a15adca0 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -23,6 +23,7 @@ import rpmUtils
 import urlgrabber.progress
 import urlgrabber.grabber
 import yum
+import rhpl
 from yum.constants import *
 from yum.Errors import RepoError, YumBaseError
 from repomd.mdErrors import PackageSackError
@@ -759,13 +760,13 @@ class YumBackend(AnacondaBackend):
                 self.selectPackage("kernel-devel.%s" % (kpkg.arch,))
 
     def selectBootloader(self):
-        if iutil.getArch() in ("i386", "x86_64"):
+        if rhpl.getArch() in ("i386", "x86_64"):
             self.selectPackage("grub")
-        elif iutil.getArch() == "s390":
+        elif rhpl.getArch() == "s390":
             self.selectPackage("s390utils")
-        elif iutil.getArch() == "ppc":
+        elif rhpl.getArch() == "ppc":
             self.selectPackage("yaboot")
-        elif iutil.getArch() == "ia64":
+        elif rhpl.getArch() == "ia64":
             self.selectPackage("elilo")
 
     def selectFSPackages(self, fsset):