[master 2/2] Use the default md metadata version for everything except /boot/efi.

dwlehman installerbot-noreply at redhat.com
Thu May 28 15:27:33 UTC 2015


From: David Lehman <dlehman at redhat.com>

Now that we've moved to grub2 this is no longer necessary for /boot.
As far as I know we have never actually allowed PReP on md, so that's
not needed either. Apparently UEFI firmware/bootloader still needs it.

Related: rhbz#1061711
---
 blivet/devices/md.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/blivet/devices/md.py b/blivet/devices/md.py
index 82b5ec8..67b0d7b 100644
--- a/blivet/devices/md.py
+++ b/blivet/devices/md.py
@@ -457,16 +457,8 @@ def preCommitFixup(self, *args, **kwargs):
         """ Determine create parameters for this set """
         mountpoints = kwargs.pop("mountpoints")
         log_method_call(self, self.name, mountpoints)
-
-        if "/boot" in mountpoints:
-            bootmountpoint = "/boot"
-        else:
-            bootmountpoint = "/"
-
-        # If we are used to boot from we cannot use 1.1 metadata
-        if getattr(self.format, "mountpoint", None) == bootmountpoint or \
-           getattr(self.format, "mountpoint", None) == "/boot/efi" or \
-           self.format.type == "prepboot":
+        # UEFI firmware/bootloader cannot read 1.1 or 1.2 metadata arrays
+        if getattr(self.format, "mountpoint", None) == "/boot/efi":
             self.metadataVersion = "1.0"
 
     def _postCreate(self):


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


More information about the anaconda-patches mailing list