[PATCH] Tweak boot device detection for EFI and PPC.

[David Lehman <dlehman@xxxxxxxxxx>]

According to my brief research, Apple bootstrap partitions should be
of a size not less than 800KB and not more than 1MB.
---
 platform.py |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/platform.py b/platform.py
index 71db883..a37d5fc 100644
--- a/platform.py
+++ b/platform.py
@@ -157,9 +157,9 @@ class EFI(Platform):
 
         # Only add the EFI partition to the default set if there's not already
         # one on the system.
-        if len(filter(lambda dev: dev.format.type == "efi" and dev.size < 256 and dev.bootable,
+        if len(filter(lambda dev: dev.format.type == "vfat" and dev.size < 256 and dev.bootable,
                       self.anaconda.id.storage.partitions)) == 0:
-            ret.append(("/boot/efi", "efi", 50, 200, 1, 0))
+            ret.append(("/boot/efi", "vfat", 50, 200, 1, 0))
 
         return ret
 
@@ -212,7 +212,7 @@ class IPSeriesPPC(PPC):
 
         # We want the first PReP partition.
         for device in storage.partitions:
-            if device.partedPartition.getFlag(parted.PARTITION_PREP):
+            if device.getFlag(parted.PARTITION_PREP):
                 bootDev = device
                 break
 
@@ -254,7 +254,8 @@ class NewWorldPPC(PPC):
 
         for part in self.anaconda.id.storage.partitions:
             # XXX do we need to also check the size?
-            if part.format.type == "hfs" and part.bootable:
+            if part.format.type == "hfs" and \
+               (800.0 / 1024.00) <= part.size <= 1:
                 bootDev = part
 
         return bootDev
@@ -272,14 +273,16 @@ class NewWorldPPC(PPC):
         else:
             ret["boot"] = (bootDev.name, N_("Apple Bootstrap"))
             for (n, device) in enumerate(self.anaconda.id.storage.partitions):
-                if device.format.type == "hfs" and device.bootable and device.path != bootDev.path:
+                if device.format.type == "hfs" and device.bootable and \
+                   device.path != bootDev.path and \
+                   (800.0 / 1024.00) <= device.size <= 1:
                     ret["boot%d" % n] = (device.path, N_("Apple Bootstrap"))
 
         return ret
 
     def setDefaultPartitioning(self):
         ret = Platform.setDefaultPartitioning(self)
-        ret.insert(0, (None, "Apple Bootstrap", 1, 1, 0, 0))
+        ret.insert(0, (None, "hfs", 1, 1, 0, 0))
         return ret
 
 class S390(Platform):
-- 
1.6.0.6

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