diff options
Diffstat (limited to 'storage/devicetree.py')
| -rw-r--r-- | storage/devicetree.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/storage/devicetree.py b/storage/devicetree.py index 996e7023e..85bef4bf7 100644 --- a/storage/devicetree.py +++ b/storage/devicetree.py @@ -205,6 +205,7 @@ class DeviceTree(object): self._ignoredDisks = [] for disk in ignored: self.addIgnoredDisk(disk) + self.immutableDevices = [] lvm.lvm_cc_resetFilter() def addIgnoredDisk(self, disk): @@ -1537,7 +1538,12 @@ class DeviceTree(object): lvm.lvm_cc_addFilterRejectRegexp(device.name) lvm.blacklistVG(device.name) for parent in device.parents: - self._removeDevice(parent, moddisk=False) + if parent.type == "partition": + self.immutableDevices.append([parent.name, + _("This partition is part of an inconsistent LVM Volume Group.")]) + else: + self._removeDevice(parent, moddisk=False) + self.addIgnoredDisk(parent.name) lvm.lvm_cc_addFilterRejectRegexp(parent.name) return @@ -1575,7 +1581,12 @@ class DeviceTree(object): lvm.blacklistVG(device.vg.name) # ignore all the pvs for parent in device.vg.parents: - self._removeDevice(parent, moddisk=False) + if parent.type == "partition": + self.immutableDevices.append([parent.name, + _("This partition is part of an inconsistent LVM Volume Group.")]) + else: + self._removeDevice(parent, moddisk=False) + self.addIgnoredDisk(parent.name) lvm.lvm_cc_addFilterRejectRegexp(parent.name) return |