Turns out this removes devices needed for installation from the devicetree, so I'm reverting it now before it's a test blocker.
This reverts commit fc648508ff4715ec5c2a2b1e4f830957088915c9.
Related: rhbz#885755 --- storage/devicelibs/lvm.py | 10 ---------- storage/devicetree.py | 4 ---- 2 files changed, 14 deletions(-)
diff --git a/storage/devicelibs/lvm.py b/storage/devicelibs/lvm.py index 7759e45..82719ef 100644 --- a/storage/devicelibs/lvm.py +++ b/storage/devicelibs/lvm.py @@ -100,16 +100,6 @@ def lvm_cc_addFilterRejectRegexp(regexp): # compoes config once more. _composeConfig()
-def lvm_cc_removeFilterRejectRegexp(regexp): - """ Remove a regular expression from the --config string. """ - global config_args_data - log.debug("lvm filter: removing %s from the reject list", regexp) - try: - config_args_data["filterRejects"].remove(regexp) - except ValueError: - log.debug("%s wasn't in the reject list", regexp) - return - def lvm_cc_resetFilter(): global config_args, config_args_data config_args_data["filterRejects"] = [] diff --git a/storage/devicetree.py b/storage/devicetree.py index 4045cdf..ea9b18b 100644 --- a/storage/devicetree.py +++ b/storage/devicetree.py @@ -710,10 +710,6 @@ class DeviceTree(object): for action in self._actions: log.debug("action: %s" % action)
- # Remove lvm filters for devices we are operating on - for device in (d for d in self._devices if d.dependsOn(action.device)): - lvm.lvm_cc_removeFilterRejectRegexp(device.name) - for action in self._actions: log.info("executing action: %s" % action) if not dryRun: