This is for master and for rhel6-branch.
---
pyanaconda/storage/devices.py | 5 +++++
pyanaconda/storage/devicetree.py | 1 -
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py
index 5462eee..d05d260 100644
--- a/pyanaconda/storage/devices.py
+++ b/pyanaconda/storage/devices.py
@@ -2873,6 +2873,11 @@ class MDRaidArrayDevice(StorageDevice):
device.setup()
udev_settle()
+
+ if self.spares:
+ # mdadm doesn't like it when you try to incrementally add spares
+ return
+
try:
mdraid.mdadd(device.path)
# mdadd causes udev events
diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py
index 8cc61b9..f6bfa5c 100644
--- a/pyanaconda/storage/devicetree.py
+++ b/pyanaconda/storage/devicetree.py
@@ -1275,7 +1275,6 @@ class DeviceTree(object):
md_array._addDevice(device)
else:
# create the array with just this one member
- # FIXME: why does this exact block appear twice?
try:
# level is reported as, eg: "raid1"
md_level = udev_device_get_md_level(info)
--
1.7.2.3
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
