[master/rhel7-branch] Don't allow /boot on iSCSI. (#1164195)
Brian C. Lane
bcl at redhat.com
Mon Jun 8 22:23:58 UTC 2015
On Mon, Jun 08, 2015 at 12:17:41PM -0400, Samantha N. Bueno wrote:
> Show an error if /boot is created on iSCSI, unless it is IBFT.
>
> Resolves: rhbz#1164195
> ---
> pyanaconda/bootloader.py | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index 9540645..b141104 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -584,8 +584,8 @@ class BootLoader(object):
> log.debug("stage1 device cannot be of type %s", device.type)
> return False
>
> - if blivet.arch.isS390() and _is_on_iscsi(device):
> - log.debug("stage1 device cannot be on an iSCSI disk on s390(x)")
> + if _is_on_iscsi(device) and not getattr(device, "ibft", False):
> + log.debug("stage1 device cannot be on an iSCSI disk")
> return False
>
> description = self.device_description(device)
> @@ -696,8 +696,8 @@ class BootLoader(object):
> if device.protected:
> valid = False
>
> - if blivet.arch.isS390() and _is_on_iscsi(device):
> - self.errors.append(_("%s cannot be on an iSCSI disk on s390(x)") % self.stage2_description)
> + if _is_on_iscsi(device) and not getattr(device, "ibft", False):
> + self.errors.append(_("%s cannot be on an iSCSI disk") % self.stage2_description)
> valid = False
>
> if not self._device_type_match(device, self.stage2_device_types):
> --
> 1.9.3
Ack.
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
More information about the anaconda-patches
mailing list