[PATCH 02/11] Use original raid level and disk set when reverting a device.

David Lehman dlehman at redhat.com
Fri Nov 9 21:09:12 UTC 2012


In this case what's really being done is we're creating a new device
with the old parameters since we failed to apply the new settings.
Either way, we shouldn't be passing the new/failed encryption, raid
level, or disk set when trying to recreate the previous device setup.
---
 pyanaconda/ui/gui/spokes/custom.py |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 630614d..f33d34e 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -1097,14 +1097,13 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                     # in this case we have removed the old device so we now have
                     # to re-create it
                     try:
-                        # XXX FIXME: pass old raid level -- not new one
-                        self._replace_device(device_type, device.size,
-                                             disks=disks,
+                        self._replace_device(current_device_type, device.size,
+                                             disks=old_disk_set,
                                              fstype=device.format.type,
                                              mountpoint=old_mountpoint,
                                              label=old_label,
-                                             raid_level=raid_level,
-                                             encrypted=encrypted,
+                                             raid_level=old_raid_level,
+                                             encrypted=prev_encrypted,
                                              selector=selector)
                     except StorageError as e:
                         # failed to recover.
-- 
1.7.7.6



More information about the anaconda-patches mailing list