Reorganize to make it easier to reset the "base" repository.

This has the side effect of making it possible to switch from a URL
installation repo to a CD and back during stage2.

1 files changed, 21 insertions, 0 deletions

diff --git a/image.py b/image.py
index 45779ef21..4c3708b6e 100644
--- a/image.py
+++ b/image.py
@@ -242,6 +242,27 @@ def presentRequiredMediaMessage(anaconda):
                                           type="custom", custom_icon="warning",
                                           custom_buttons=[_("_Reboot"), _("_Back"), _("_Continue")])
 
+# Find an attached CD/DVD drive with media in it that contains packages,
+# and return that device name.
+def scanForMedia(tree):
+    drive = None
+
+    for cdr in map(lambda d: "/dev/%s" % d, isys.cdromList()):
+        try:
+            if isys.mount(cdr, tree, fstype="iso9660", readOnly=1):
+                continue
+        except:
+            continue
+
+        if not verifyMedia(tree, 1):
+            isys.umount(tree)
+            continue
+
+        drive = cdr
+        break
+
+    return drive
+
 def umountImage(tree, currentMedia):
     if currentMedia is not None:
         isys.umount(tree, removeDir=0)