[PATCH] Check whatever contains /boot on PPC as well as the bootable part (#523747).

[Chris Lumens <clumens@xxxxxxxxxx>]

---
 platform.py |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/platform.py b/platform.py
index 072efe5..83188a8 100644
--- a/platform.py
+++ b/platform.py
@@ -333,7 +333,14 @@ class IPSeriesPPC(PPC):
         if bootPart.geometry.end * bootPart.geometry.device.sectorSize / (1024.0 * 1024) > 4096:
             errors.append(_("The boot partition must be within the first 4MB of the disk."))
 
-        return errors
+        # All of the above just checks the PPC PReP boot partitions.  We still
+        # need to make sure that whatever /boot is on also meets these criteria.
+        try:
+            req = self.anaconda.id.storage.mountpoints["/boot"]
+        except KeyError:
+            req = self.anaconda.id.storage.rootDevice
+
+        return errors + self.checkBootRequest(req)
 
     def setDefaultPartitioning(self):
         ret = PPC.setDefaultPartitioning(self)
@@ -395,7 +402,14 @@ class NewWorldPPC(PPC):
         if not disk.type == self.diskType.name:
             errors.append(_("%s must have a mac disk label.") % req.disk.name)
 
-        return errors
+        # All of the above just checks the appleboot partitions.  We still
+        # need to make sure that whatever /boot is on also meets these criteria.
+        try:
+            req = self.anaconda.id.storage.mountpoints["/boot"]
+        except KeyError:
+            req = self.anaconda.id.storage.rootDevice
+
+        return errors + self.checkBootRequest(req)
 
     def setDefaultPartitioning(self):
         ret = Platform.setDefaultPartitioning(self)
-- 
1.6.4.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list