From 0d147c5de5e613377531ae256f382682f55575ca Mon Sep 17 00:00:00 2001 From: David Lehman Date: Mon, 12 Aug 2013 16:31:52 -0500 Subject: [PATCH 5/9] Do not deactivate all devices at the end of DeviceTree.populate. Do deactivate those we're hiding, though. --- blivet/devicetree.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/blivet/devicetree.py b/blivet/devicetree.py index 8c72768..277df9a 100644 --- a/blivet/devicetree.py +++ b/blivet/devicetree.py @@ -1934,8 +1934,9 @@ class DeviceTree(object): # inconsistencies are ignored or resolved. self._handleInconsistencies() - self.teardownAll() + self._applyDiskFilters() + def _applyDiskFilters(self): def _is_ignored(disk): return ((self.ignoredDisks and disk.name in self.ignoredDisks) or (self.exclusiveDisks and @@ -1953,6 +1954,12 @@ class DeviceTree(object): ignored = any(_is_ignored(d) for d in disk.parents) if ignored: + if flags.installer_mode: + deps = self.getDependentDevices(disk) + deps.sort(key=lambda d: len(d.ancestors), reverse=True) + for dep in deps: + dep.teardown() + self.hide(disk) def teardownAll(self): -- 1.8.1.4