[anaconda 1/2] Don't allow /boot on lvm on s390x. (#1035201)

Samantha N. Bueno sbueno+anaconda at redhat.com
Mon Sep 29 12:08:47 UTC 2014


By disallowing this, numerous annoyances can be fixed, such as
/boot being encrypted if you selected autopart w/lvm + encryption
(which is not possible on s390x). Also, because /boot could only
ever be on a single PV anyway, it is rather meaningless.

Resolves: rhbz# 1035201
---
 pyanaconda/bootloader.py | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 4832c49..11e2f63 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -41,7 +41,6 @@ from pyanaconda.nm import nm_device_hwaddress
 from blivet import platform
 from blivet.size import Size
 from pyanaconda.i18n import _, N_
-from blivet.errors import SinglePhysicalVolumeError
 
 import logging
 log = logging.getLogger("anaconda")
@@ -2065,7 +2064,7 @@ class ZIPL(BootLoader):
     packages = ["s390utils-base"]
 
     # stage2 device requirements
-    stage2_device_types = ["partition", "lvmlv"]
+    stage2_device_types = ["partition"]
 
     @property
     def stage2_format_types(self):
@@ -2085,23 +2084,6 @@ class ZIPL(BootLoader):
     # configuration
     #
 
-    def is_valid_stage2_device(self, device, linux=True, non_linux=False):
-        valid = super(ZIPL, self).is_valid_stage2_device(self.stage2_device)
-
-        # 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()
-            except SinglePhysicalVolumeError as e:
-                msg = str(e)
-                self.errors.append(msg)
-                valid = False
-
-        log.debug("ZIPL.is_valid_stage2_device(%s) returning %s", \
-                  device.name, valid)
-        return valid
-
     @property
     def boot_dir(self):
         return "/boot"
-- 
1.9.3



More information about the anaconda-patches mailing list