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

[PATCH] Activate storage before looking up the hdiso source drive (#491781).



---
 storage/__init__.py |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/storage/__init__.py b/storage/__init__.py
index 7c17ec8..63f04e1 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -69,11 +69,16 @@ def storageInitialize(anaconda):
        stat.S_ISBLK(os.stat("/dev/live")[stat.ST_MODE]):
         target = os.readlink("/dev/live")
         storage.protectedPartitions = [target]
+        storage.reset()
     elif anaconda.methodstr and anaconda.methodstr.startswith("hd:"):
         method = anaconda.methodstr[3:]
         devspec = method.split(":", 3)[0]
 
+        storage.reset()
         device = storage.devicetree.resolveDevice(devspec)
+        storage.protectedPartitions = [device.name]
+        storage.devicetree.protectedPartitions = [device.name]
+
         if device is None:
             if anaconda.id.getUpgrade():
                 return
@@ -85,10 +90,6 @@ def storageInitialize(anaconda):
                     type="custom", custom_buttons = [_("_Exit installer")])
                 sys.exit(1)
 
-        storage.protectedPartitions = [device.name]
-
-    storage.reset()
-
 # dispatch.py helper function
 def storageComplete(anaconda):
     if anaconda.dir == DISPATCH_BACK:
-- 
1.6.1.3


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