another taroon merge. tagged before as before-taroon-merge, after as

after-taroon-merge

this one adds s390 fixes, basic i/p series platform support, support for
multiple kernels and one second stage, cmdline kickstart mode (nice for s390),
some warning cleanups.

1 files changed, 16 insertions, 0 deletions

diff --git a/partitions.py b/partitions.py
index 3cb23c54f..4a4bb0955 100644
--- a/partitions.py
+++ b/partitions.py
@@ -631,6 +631,13 @@ class Partitions:
         if iutil.getArch() == "ia64":
             bootreq = self.getRequestByMountPoint("/boot/efi")
             return bootreq
+        elif (iutil.getPPCMachine() == "pSeries" or
+              iutil.getPPCMachine() == "iSeries"):
+            for req in self.requests:
+                if req.fstype == fsset.fileSystemTypeGet("PPC PReP Boot"):
+                    return req
+            return None
+        
         if not bootreq:
             bootreq = self.getRequestByMountPoint("/boot")
         if not bootreq:
@@ -638,6 +645,15 @@ class Partitions:
             
         return bootreq
 
+    def getBootableMountpoints(self):
+        """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":
+            return [ "/boot/efi" ]
+        else:
+            return [ "/boot", "/" ]
+
     def isBootable(self, request):
         """Returns if the request should be considered a 'bootable' request.