[rhel6-branch 12/30] DISK_PT_GMBR_BOOT is not defined in pyparted in RHEL6.
mulkieran
installerbot-noreply at redhat.com
Thu May 28 21:04:17 UTC 2015
From: Anne Mulhern <amulhern at redhat.com>
Assume it's unavailable.
Leave the informational log message.
Signed-off-by: Anne Mulhern <amulhern at redhat.com>
---
blivet/formats/disklabel.py | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py
index ed42bef..3d0c91b 100644
--- a/blivet/formats/disklabel.py
+++ b/blivet/formats/disklabel.py
@@ -26,7 +26,6 @@
import parted
import _ped
from ..errors import DeviceFormatError, DiskLabelCommitError, InvalidDiskLabelError
-from .. import arch
from .. import udev
from .. import util
from ..flags import flags
@@ -157,17 +156,7 @@ def partedDisk(self):
if self._partedDisk.isFlagAvailable(parted.DISK_CYLINDER_ALIGNMENT):
self._partedDisk.unsetFlag(parted.DISK_CYLINDER_ALIGNMENT)
- # Set the boot flag on the GPT PMBR, this helps some BIOS systems boot
- if self._partedDisk.isFlagAvailable(parted.DISK_GPT_PMBR_BOOT):
- # MAC can boot as EFI or as BIOS, neither should have PMBR boot set
- if arch.isEfi() or arch.isMactel():
- self._partedDisk.unsetFlag(parted.DISK_GPT_PMBR_BOOT)
- log.debug("Clear pmbr_boot on %s", self._partedDisk)
- else:
- self._partedDisk.setFlag(parted.DISK_GPT_PMBR_BOOT)
- log.debug("Set pmbr_boot on %s", self._partedDisk)
- else:
- log.debug("Did not change pmbr_boot on %s", self._partedDisk)
+ log.debug("Did not change pmbr_boot on %s", self._partedDisk)
return self._partedDisk
--
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/0a24ec629265a0a6f5079e266aac9e0f6981d98f
More information about the anaconda-patches
mailing list