[master/f20-branch/rhel7-branch] Check that s390x LVM configuration is valid. (#873135, #885011)

Samantha N. Bueno sbueno+anaconda at redhat.com
Fri Oct 25 19:41:13 UTC 2013


On s390x, /boot (or / if /boot isn't a mountpoint) needs to exist on a
single PV if using LVM, so check for this.

Resolves: rhbz#873135
Resolves: rhbz#885011
---
 pyanaconda/bootloader.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index cf769ed..600ba6f 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -40,6 +40,7 @@ import pyanaconda.network
 from pyanaconda.nm import nm_device_hwaddress
 from blivet import platform
 from pyanaconda.i18n import _, N_
+from blivet.errors import SinglePhysicalVolumeError
 
 import logging
 log = logging.getLogger("anaconda")
@@ -718,6 +719,17 @@ class BootLoader(object):
                                  "device.") % self.stage2_description)
             valid = False
 
+        # s390x can only have /boot on a single PV; or if there is no /boot
+        # partition, / must be on a single PV, so check for that here
+        if self.stage2_device.type == "lvmlv":
+            try:
+                self.stage2_device._getSinglePV()
+                valid = True
+            except SinglePhysicalVolumeError as e:
+                msg = str(e)
+                self.errors.append(msg)
+                valid = False
+
         log.debug("is_valid_stage2_device(%s) returning %s" % (device.name,
                                                                 valid))
         return valid
-- 
1.8.3.1



More information about the anaconda-patches mailing list