Revert the .discinfo check patch, bump the release.

anaconda.spec

@@ -3,12 +3,13 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 11.4.0.73
-Release: 1
+Release: 2
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
 
 Source0: anaconda-%{version}.tar.bz2
+Patch0: revert-discinfo-check.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -145,6 +146,7 @@ sets, but are not meant for use on already installed systems.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %{__make} depend
@@ -207,6 +209,10 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Apr 17 2008 Chris Lumens <clumens@redhat.com> 11.4.0.73-2
+- Revert the patch that doesn't check for .discinfo on rescue mode CDs
+  as this also breaks the method prompting screen.
+
 * Wed Apr 16 2008 David Cantrell <dcantrell@redhat.com> - 11.4.0.73-1
 - Fix figuring out that the CD has stage2 on it and should be mounted. (clumens)
 - Don't copy the stage2 image on NFS installs (#438377). (clumens)

revert-discinfo-check.patch

@@ -0,0 +1,52 @@
+diff --git a/loader2/cdinstall.c b/loader2/cdinstall.c
+index 768d83d..1dd28cf 100644
+--- a/loader2/cdinstall.c
++++ b/loader2/cdinstall.c
+@@ -234,7 +234,7 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData,
+     int i, r, rc;
+     int foundinvalid = 0;
+     int stage2inram = 0;
+-    char *buf, *stage2loc, *imageDir;
++    char *buf, *stage2loc, *discinfoloc, *imageDir;
+     char *stage2img;
+     struct device ** devices;
+     char *cddev = NULL;
+@@ -248,9 +248,11 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData,
+     if (loaderData && FL_STAGE2(flags)) {
+         stage2loc = strdup(location);
+         r = asprintf(&imageDir, "%.*s", (int) (strrchr(location, '/') - location), location);
++        r = asprintf(&discinfoloc, "%s/.discinfo", imageDir);
+     } else {
+         r = asprintf(&stage2loc, "%s/images/stage2.img", location);
+         r = asprintf(&imageDir, "%s/images", location);
++        r = asprintf(&discinfoloc, "%s/.discinfo", location);
+     }
+ 
+     /* JKFIXME: ASSERT -- we have a cdrom device when we get here */
+@@ -271,7 +273,9 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData,
+ 
+             if (!(rc=doPwMount(devices[i]->device, location, "iso9660", "ro"))) {
+                 cddev = devices[i]->device;
+-                if (!access(stage2loc, R_OK)) {
++                if (!access(stage2loc, R_OK) &&
++                    (!requirepkgs || !access(discinfoloc, R_OK))) {
++
+                     /* if in rescue mode lets copy stage 2 into RAM so we can */
+                     /* free up the CD drive and user can have it avaiable to  */
+                     /* aid system recovery.                                   */
+@@ -313,6 +317,7 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData,
+ 
+                     free(stage2loc);
+                     free(imageDir);
++                    free(discinfoloc);
+ 
+                     if (r == -1)
+                         return NULL;
+@@ -356,6 +361,7 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData,
+ err:
+     free(stage2loc);
+     free(imageDir);
++    free(discinfoloc);
+     return NULL;
+ }
+ 

sources

@@ -1,2 +1 @@
-75da8954fc0e8c40e5802b483ce81cbb  anaconda-11.4.0.72.tar.bz2
 99daae7722f324a45fdfa42bb7f67c35  anaconda-11.4.0.73.tar.bz2