FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu User

 
 
LinkBack Thread Tools
 
Old 04-21-2008, 04:14 AM
Jerry Vonau
 
Default NEW PATCH bz 442098

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);
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 04-21-2008, 07:26 PM
Jerry Vonau
 
Default NEW PATCH bz 442098

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);
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 03:47 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org