Re: NEW PATCH bz 442098

[Jerry Vonau <jvonau shaw ca>]

Jerry Vonau wrote:

> I'm sorry that one gave you grief, this one works better, as in not 
> breaking other things. ;-)
I lied, it breaks network based rescue. ;-(
If rescue is passed, then there is the false assumption that the cd is 
present, this patch corrects that oversight.

Jerry



--- cdinstall.c.orig	2008-04-18 15:06:16.000000000 -0500
+++ cdinstall.c	2008-04-21 14:03:35.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,9 +311,12 @@
                         umount(location);
                     }
 
-                    r = asprintf(&buf, "cdrom://%s:%s",
-                                 devices[i]->device, location);
 
+                    if (((requirepkgs) && (access(discinfoloc, R_OK)))  
+                       || ((FL_RESCUE(flags)) && (access(stage2loc, R_OK)))) 
+
+                        r = asprintf(&buf, "cdrom://%s:%s",
+                                 devices[i]->device, location);
                     free(stage2loc);
                     free(imageDir);
                     free(discinfoloc);