[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH f14-branch master 1/3] Properly rescan disks when moving back (#635778)



NOTE: I've tested this against RC3 with 2 drives on a KVM virt.

Only call storage.reset() once when moving backwards from the
partitioning GUI.

Related: rhbz#635778
---
 pyanaconda/iw/partition_gui.py     |    6 ------
 pyanaconda/storage/partitioning.py |    5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pyanaconda/iw/partition_gui.py b/pyanaconda/iw/partition_gui.py
index 0885959..015aa76 100644
--- a/pyanaconda/iw/partition_gui.py
+++ b/pyanaconda/iw/partition_gui.py
@@ -906,12 +906,6 @@ class PartitionWindow(InstallWindow):
 
     def getPrev(self):
         self.stripeGraph.shutDown()
-        # temporarily unset storage.clearPartType so that all devices will be
-        # found during storage reset
-        clearPartType = self.storage.clearPartType
-        self.storage.clearPartType = None
-        self.storage.reset()
-        self.storage.clearPartType = clearPartType
         self.tree.clear()
         del self.parent
         return None
diff --git a/pyanaconda/storage/partitioning.py b/pyanaconda/storage/partitioning.py
index a655d0d..ea209aa 100644
--- a/pyanaconda/storage/partitioning.py
+++ b/pyanaconda/storage/partitioning.py
@@ -177,7 +177,12 @@ def doAutoPartition(anaconda):
     log.debug("storage.partitioned: %s" % [d.name for d in anaconda.storage.partitioned])
     log.debug("all names: %s" % [d.name for d in anaconda.storage.devices])
     if anaconda.dir == DISPATCH_BACK:
+        # temporarily unset storage.clearPartType so that all devices will be
+        # found during storage reset
+        clearPartType = anaconda.storage.clearPartType
+        anaconda.storage.clearPartType = None
         anaconda.storage.reset()
+        anaconda.storage.clearPartType = clearPartType
         return
 
     disks = []
-- 
1.7.2.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]