Add support for cdrom and harddrive methods, including switching.

Clean up mountImage and opticalInstallMedia to match their new surroundings.

Allow a path to a specific image file to be specified to mountImage.

Don't automatically mount optical media we detect in opticalInstallMedia.

1 files changed, 14 insertions, 9 deletions

diff --git a/pyanaconda/image.py b/pyanaconda/image.py
index 4af797330..009e38ae2 100644
--- a/pyanaconda/image.py
+++ b/pyanaconda/image.py
@@ -152,17 +152,21 @@ def mountImageDirectory(method, storage):
                 if errorHandler.cb(exn) == ERROR_RAISE:
                     raise exn
 
-def mountImage(isodir, tree, messageWindow):
+def mountImage(isodir, tree):
     while True:
-        image = findFirstIsoImage(isodir, messageWindow)
-        if image is None:
-            exn = MissingImageError()
-            if errorHandler.cb(exn) == ERROR_RAISE:
-                raise exn
-            else:
-                continue
+        if os.path.isfile(isodir):
+            image = isodir
+        else:
+            image = findFirstIsoImage(isodir)
+            if image is None:
+                exn = MissingImageError()
+                if errorHandler.cb(exn) == ERROR_RAISE:
+                    raise exn
+                else:
+                    continue
+
+            image = os.path.normpath("%s/%s" % (isodir, image))
 
-        image = os.path.normpath("%s/%s" % (isodir, image))
         try:
             isys.mount(image, tree, fstype = 'iso9660', readOnly = True)
         except SystemError:
@@ -190,6 +194,7 @@ def opticalInstallMedia(devicetree, mountpoint=INSTALL_TREE):
             dev.format.unmount()
             continue
 
+        dev.format.unmount()
         retval = dev
         break