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 > Redhat > EXT3 Users

 
 
LinkBack Thread Tools
 
Old 04-12-2008, 03:27 PM
Jerry Vonau
 
Default PATCH bz 442098

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.


Jerry
--- cdinstall.c.orig 2008-04-12 09:35:58.000000000 -0500
+++ cdinstall.c 2008-04-12 10:08:32.000000000 -0500
@@ -234,7 +234,7 @@
int i, r, rc;
int foundinvalid = 0;
int stage2inram = 0;
- char *buf, *stage2loc, *discinfoloc, *imageDir;
+ char *buf, *stage2loc, *imageDir;
char *stage2img;
struct device ** devices;
char *cddev = NULL;
@@ -248,11 +248,9 @@
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 */
@@ -273,9 +271,8 @@

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) && (!requirepkgs)){
+
/* 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. */
@@ -317,7 +314,6 @@

free(stage2loc);
free(imageDir);
- free(discinfoloc);

if (r == -1)
return NULL;
@@ -361,7 +357,6 @@
err:
free(stage2loc);
free(imageDir);
- free(discinfoloc);
return NULL;
}

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 04-15-2008, 12:08 AM
Jeremy Katz
 
Default PATCH bz 442098

On Sat, 2008-04-12 at 10:27 -0500, Jerry Vonau 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.

This one also seems okay to me, but I'll defer to Chris again since he's
the one that moved all this stuff around

Jeremy

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 04-15-2008, 08:29 AM
Chris Lumens
 
Default PATCH bz 442098

> 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

_______________________________________________
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 08:09 PM.

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