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

[PATCH 2/2] Move image file setup after initInterface



Otherwise there is no anaconda.intf and attempts to prompt the user
fail.
---
 anaconda |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/anaconda b/anaconda
index 3f74832..ff62eb1 100755
--- a/anaconda
+++ b/anaconda
@@ -616,24 +616,6 @@ if __name__ == "__main__":
             (path, name) = string.split(mod, ":")
             anaconda.extraModules.append((path, name))
 
-    image_count = 0
-    for image in opts.images:
-        image_spec = image.rsplit(":", 1)
-        path = image_spec[0]
-        if len(image_spec) == 2 and image_spec[1].strip():
-            name = image_spec[1].strip()
-        else:
-            name = os.path.splitext(os.path.basename(path))[0]
-
-        if "/" in name or name in anaconda.storage.config.diskImages.keys():
-            name = "diskimg%d" % image_count
-
-        log.info("naming disk image '%s' '%s'" % (path, name))
-        anaconda.storage.config.diskImages[name] = path
-        image_count += 1
-        flags.imageInstall = True
-    anaconda.storage.setupDiskImages()
-
     if opts.vnc:
         flags.usevnc = 1
         anaconda.displayMode = 'g'
@@ -905,6 +887,24 @@ if __name__ == "__main__":
         anaconda.keyboard.set(opts.keymap)
         anaconda.keyboard.activate()
 
+    image_count = 0
+    for image in opts.images:
+        image_spec = image.rsplit(":", 1)
+        path = image_spec[0]
+        if len(image_spec) == 2 and image_spec[1].strip():
+            name = image_spec[1].strip()
+        else:
+            name = os.path.splitext(os.path.basename(path))[0]
+
+        if "/" in name or name in anaconda.storage.config.diskImages.keys():
+            name = "diskimg%d" % image_count
+
+        log.info("naming disk image '%s' '%s'" % (path, name))
+        anaconda.storage.config.diskImages[name] = path
+        image_count += 1
+        flags.imageInstall = True
+    anaconda.storage.setupDiskImages()
+
     if anaconda.ksdata:
         from pyanaconda import storage
         storage.storageInitialize(anaconda)
-- 
1.7.4


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