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

[PATCH 2/2] Fix upgrade selected in UI after storage reset (#503302)



Fix of this UI flow: doing storage reset after root partitions discovery (e.g.
in partitioning step) and then going back and selecting upgrade. In place of
using root partition device objects obsoleted by storage reset, find root
partition devices of new device tree.
---
 iw/examine_gui.py   |    6 ++++++
 storage/__init__.py |    2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/iw/examine_gui.py b/iw/examine_gui.py
index 334f3d1..3a62e06 100644
--- a/iw/examine_gui.py
+++ b/iw/examine_gui.py
@@ -90,6 +90,12 @@ class UpgradeExamineWindow (InstallWindow):
 	else:
 	    self.doupgrade = self.anaconda.id.upgrade
 
+        # we might get here after storage reset that obsoleted
+        # root device objects we had found
+        if not self.anaconda.id.rootParts:
+            self.anaconda.id.rootParts = upgrade.findExistingRoots(self.anaconda)
+            upgrade.setUpgradeRoot(self.anaconda)
+
         self.parts = self.anaconda.id.rootParts 
 
         vbox = gtk.VBox (False, 10)
diff --git a/storage/__init__.py b/storage/__init__.py
index aed4f03..888b6d3 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -298,6 +298,8 @@ class Storage(object):
                                      luksDict=self.__luksDevs)
         self.devicetree.populate()
         self.fsset = FSSet(self.devicetree)
+        self.anaconda.id.rootParts = None
+        self.anaconda.id.upgradeRoot = None
         w.pop()
 
     @property
-- 
1.6.0.6


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