pull up fix for #105788 from taroon-branch

1 files changed, 19 insertions, 0 deletions

diff --git a/partitions.py b/partitions.py
index 198d811f2..335122a95 100644
--- a/partitions.py
+++ b/partitions.py
@@ -823,10 +823,17 @@ class Partitions:
             iutil.getPPCMachine() == "iSeries"):
             reqs = self.getBootableRequest()
             found = 0
+
+            bestreq = None
             if reqs:
                 for req in reqs:
                     if req.fstype == fsset.fileSystemTypeGet("PPC PReP Boot"):
                         found = 1
+                        # the best one is either the first or the first
+                        # newly formatted one
+                        if ((bestreq is None) or ((bestreq.format == 0) and
+                                                  (req.format == 1))):
+                            bestreq = req
                         break
             if iutil.getPPCMachine() == "iSeries" and iutil.hasIbmSis():
                 found = 1
@@ -834,6 +841,18 @@ class Partitions:
             if not found:
                 errors.append(_("You must create a PPC PReP Boot partition."))
 
+            if bestreq is not None:
+                if (iutil.getPPCMachine() == "pSeries"):
+                    minsize = 4
+                else:
+                    minsize = 16
+                if bestreq.getActualSize(self, diskset) < minsize:
+                    warnings.append(_("Your %s partition is less than %s "
+                                      "megabytes which is lower than "
+                                      "recommended for a normal %s install.")
+                                    %(_("PPC PReP Boot"), size, productName))
+                    
+
         for (mount, size) in checkSizes:
             req = self.getRequestByMountPoint(mount)
             if not req: