Disable MacEFI platform type and hfs+ ESP (#1119305)

hfsplus-tools aren't available in RHEL so we can't make a hfs+ ESP. But
we can make a standard ESP which will appear in the boot menu as 'EFI
Boot'

Related: rhbz#1119305
(cherry picked from commit c35aafe)

blivet/__init__.py

@@ -1834,10 +1834,7 @@ def getFSType(self, mountpoint=None):
         elif mountpoint == "/boot":
             fstype = self.defaultBootFSType
         elif mountpoint == "/boot/efi":
-            if arch.isMactel():
-                fstype = "macefi"
-            else:
-                fstype = "efi"
+            fstype = "efi"
 
         return fstype
 

blivet/platform.py

@@ -420,9 +420,7 @@ def getPlatform():
     elif arch.isS390():
         return S390()
     elif arch.isEfi():
-        if arch.isMactel():
-            return MacEFI()
-        elif arch.isAARCH64():
+        if arch.isAARCH64():
             return Aarch64EFI()
         else:
             return EFI()