NEW PATCH bz 442098

[Jerry Vonau <jvonau shaw ca>]

Chris Lumens wrote:
> > The boot.iso of 080411 does not have the .discinfo file in the root of the 
> > cdrom. The check for .discinfo has been removed for urlinstall, mountStage2 
> > is going to validate .buildstamp anyway, so here is a patch to remove it 
> > from cdinstall.
>
> Looks fine to me too.  Applied.  Thanks for the patch.
>
> - Chris

I'm sorry that one gave you grief, this one works better, as in not 
breaking other things. ;-)

Jerry

--- cdinstall.c.orig	2008-04-18 15:06:16.000000000 -0500
+++ cdinstall.c	2008-04-20 16:45:53.000000000 -0500
@@ -273,8 +273,7 @@
 
             if (!(rc=doPwMount(devices[i]->device, location, "iso9660", "ro"))) {
                 cddev = devices[i]->device;
-                if (!access(stage2loc, R_OK) &&
-                    (!requirepkgs || !access(discinfoloc, R_OK))) {
+                if ((!access(stage2loc, 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  */
@@ -312,7 +311,9 @@
                         umount(location);
                     }
 
-                    r = asprintf(&buf, "cdrom://%s:%s",
+                    if (((requirepkgs) && (access(discinfoloc, R_OK)))  
+                     || (FL_RESCUE(flags)))
+                        r = asprintf(&buf, "cdrom://%s:%s",
                                  devices[i]->device, location);
 
                     free(stage2loc);