[rhel7-branch 3/7] Disable MacEFI platform type and hfs+ ESP (#1119305)

bcl installerbot-noreply at redhat.com
Thu May 28 23:36:18 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

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 c35aafe4b27318faee52b5a0ea44ca9a6fd4a1ec)
---
 blivet/__init__.py | 5 +----
 blivet/platform.py | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/blivet/__init__.py b/blivet/__init__.py
index 7051ecb..9ba9723 100644
--- a/blivet/__init__.py
+++ b/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
 
diff --git a/blivet/platform.py b/blivet/platform.py
index cd93f97..1fd0f12 100644
--- a/blivet/platform.py
+++ b/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()


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/2f4297576cde7076284e8f3c9389cdeeab033def


More information about the anaconda-patches mailing list