* loader2/cdinstall.c: check all cdroms for ks.cfg (#203344)

* instdata.py iw/examine_gui.py: save examine gui result (#208053)

4 files changed, 29 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a00a8c27..2de3b73ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-04  Dave Lehman  <dlehman@redhat.com>
+
+	* loader2/cdinstall.c: check all cdroms for ks.cfg (#203344)
+	* instdata.py iw/examine_gui.py: save examine gui result (#208053)
+
 2006-12-01  Jeremy Katz  <katzj@redhat.com>
 
 	* upgrade.py (upgrade_remove_blacklist): tuples aren't extendable;
diff --git a/instdata.py b/instdata.py
index 552f54c95..e3d7f8769 100644
--- a/instdata.py
+++ b/instdata.py
@@ -84,6 +84,8 @@ class InstallData:
         self.upgradeInfoFound = None
         self.configFileData = self.tmpData
         self.firstboot = FIRSTBOOT_DEFAULT
+        # Used to save the user's choice to upgrade or install
+        self.doupgrade = None
 
     def setInstallProgressClass(self, c):
 	self.instProgress = c
diff --git a/iw/examine_gui.py b/iw/examine_gui.py
index 6a4c129f6..dcea4c63a 100644
--- a/iw/examine_gui.py
+++ b/iw/examine_gui.py
@@ -48,8 +48,12 @@ class UpgradeExamineWindow (InstallWindow):
             else:
                 self.dispatch.skipStep("indivpackage")
             self.dispatch.skipStep("installtype", skip = 1)
+            # Save the user's choice for recall
+            self.id.doupgrade = True
         else:
-            self.dispatch.skipStep("installtype", skip = 0)
+            self.dispatch.skipStep("installtype", skip = 0) 
+            # Save the user's choice for recall
+            self.id.doupgrade = False
 
         return None
 
@@ -90,7 +94,11 @@ class UpgradeExamineWindow (InstallWindow):
         self.id = id
         self.chroot = chroot
 
-	self.doupgrade = dispatch.stepInSkipList("installtype")
+        if self.id.doupgrade == None:
+            self.doupgrade = dispatch.stepInSkipList("installtype")
+        else:
+            self.doupgrade = self.id.doupgrade
+        
         self.parts = self.id.rootParts 
 
         vbox = gtk.VBox (gtk.FALSE, 10)
diff --git a/loader2/cdinstall.c b/loader2/cdinstall.c
index afbe8efe6..196c27c3f 100644
--- a/loader2/cdinstall.c
+++ b/loader2/cdinstall.c
@@ -420,7 +420,7 @@ void setKickstartCD(struct loaderData_s * loaderData, int argc,
 }
 
 int kickstartFromCD(char *kssrc, int flags) {
-    int rc;
+    int rc, i;
     char *p, *kspath;
     struct device ** devices;
 
@@ -441,14 +441,17 @@ int kickstartFromCD(char *kssrc, int flags) {
     if (!p || strlen(kspath) < 1)
 	kspath = "/ks.cfg";
 
-    if ((rc=getKickstartFromBlockDevice(devices[0]->device, kspath))) {
-	if (rc == 3) {
-	    startNewt(flags);
-	    newtWinMessage(_("Error"), _("OK"),
-			   _("Cannot find kickstart file on CDROM."));
-	}
-	return 1;
+    for (i=0; devices[i]; i++) {
+        if (!devices[i]->device)
+            continue;
+
+        rc = getKickstartFromBlockDevice(devices[i]->device, kspath);
+        if (rc == 0)
+            return 0;
     }
 
-    return 0;
+    startNewt();
+    newtWinMessage(_("Error"), _("OK"),
+                   _("Cannot find kickstart file on CDROM."));
+    return 1;
 }