2004-11-03 Jeremy Katz <katzj@redhat.com>

	* autopart.py (getAutopartitionBoot): Use
	iutil.hasiSeriesNativeStorage instead of iutil.hasIbmSis()
	* partitions.py (Partitions.sanityCheckAllRequests): Likewise.

	* iutil.py (hasiSeriesNativeStorage): Rename from hasIbmSis(),
	check for ipr as well as ibmsis.

4 files changed, 13 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 16a767fdf..0c9a12677 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-11-03  Jeremy Katz  <katzj@redhat.com>
 
+	* autopart.py (getAutopartitionBoot): Use
+	iutil.hasiSeriesNativeStorage instead of iutil.hasIbmSis()
+	* partitions.py (Partitions.sanityCheckAllRequests): Likewise.
+
+	* iutil.py (hasiSeriesNativeStorage): Rename from hasIbmSis(),
+	check for ipr as well as ibmsis.
+
 	* packages.py (copyAnacondaLogs): Set permissions on logs (#137963)
 
 	* scripts/scrubtree: Don't use busybox shutdown, poweroff, or
diff --git a/autopart.py b/autopart.py
index ca3434bae..0b93a289d 100644
--- a/autopart.py
+++ b/autopart.py
@@ -1568,9 +1568,9 @@ def getAutopartitionBoot():
     elif (iutil.getPPCMachine() == "pSeries"):
         return [ (None, "PPC PReP Boot", 4, None, 0, 1, 0),
                  ("/boot", None, 100, None, 0, 1, 0) ]
-    elif (iutil.getPPCMachine() == "iSeries") and not iutil.hasIbmSis():
+    elif (iutil.getPPCMachine() == "iSeries") and not iutil.hasiSeriesNativeStorage():
         return [ (None, "PPC PReP Boot", 16, None, 0, 1, 0) ]
-    elif (iutil.getPPCMachine() == "iSeries") and iutil.hasIbmSis():
+    elif (iutil.getPPCMachine() == "iSeries") and iutil.hasiSeriesNativeStorage():
         return []
     elif (iutil.getPPCMachine() == "PMac") and iutil.getPPCMacGen == "NewWorld":
         return [ ( None, "Apple Bootstrap", 1, 1, 0, 1, 0) , 
diff --git a/iutil.py b/iutil.py
index dcac3f604..6d94655b2 100644
--- a/iutil.py
+++ b/iutil.py
@@ -523,7 +523,7 @@ def isUSBDevFSMounted():
     return 0
 
 # this is disgusting and I feel very dirty
-def hasIbmSis():
+def hasiSeriesNativeStorage():
     if getArch() != "ppc":
         return
 
@@ -534,6 +534,8 @@ def hasIbmSis():
     for line in lines:
         if line.startswith("ibmsis"):
             return 1
+        if line.startswith("ipr"):
+            return 1
 
     return 0
 
diff --git a/partitions.py b/partitions.py
index a969bd7e6..df53fe2f4 100644
--- a/partitions.py
+++ b/partitions.py
@@ -789,7 +789,7 @@ class Partitions:
                                                   (req.format == 1))):
                             bestreq = req
                         break
-            if iutil.getPPCMachine() == "iSeries" and iutil.hasIbmSis():
+            if iutil.getPPCMachine() == "iSeries" and iutil.hasiSeriesNativeStorage():
                 found = 1
                 
             if not found: