[PATCH] Don't crash on cleanup with DASDs or iSCSI devices present.
David Lehman
dlehman at redhat.com
Tue Jun 30 19:05:17 UTC 2015
Resolves: rhbz#1166506
---
blivet/devicetree.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 73facfe..05b6dca 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -1004,7 +1004,7 @@ class DeviceTree(object):
model = util.get_sysfs_attr(sysfs_path, "device/model")
kwargs = { "serial": serial, "vendor": vendor, "model": model, "bus": bus }
- if udev.device_is_iscsi(info):
+ if udev.device_is_iscsi(info) and not self._cleanup:
diskType = iScsiDiskDevice
initiator = udev.device_get_iscsi_initiator(info)
target = udev.device_get_iscsi_name(info)
@@ -1060,7 +1060,7 @@ class DeviceTree(object):
del kwargs["serial"]
del kwargs["vendor"]
del kwargs["bus"]
- elif udev.device_is_dasd(info):
+ elif udev.device_is_dasd(info) and not self._cleanup:
diskType = DASDDevice
kwargs["busid"] = udev.device_get_dasd_bus_id(info)
kwargs["opts"] = {}
--
2.4.3
More information about the anaconda-patches
mailing list