Attachment 289738 Details for Bug 397501 – patch to loader

[patch] patch to loader

useCD (text/plain), 2.29 KB, created by Jerry Vonau on 2007-12-16 23:48:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jerry Vonau

Created: 2007-12-16 23:48:23 UTC

Size: 2.29 KB

patch

obsolete

>--- urlinstall.c.orig	2007-12-13 21:52:57.000000000 -0600
>+++ urlinstall.c	2007-12-14 00:20:42.000000000 -0600
>@@ -97,15 +97,17 @@
>    newtWinMessage(_("Error"), _("OK"), _(msg));
> }
> 
>-static int loadUrlImages(struct iurlinfo * ui) {
>+static int loadUrlImages(struct iurlinfo * ui, char * location, 
>+                         moduleInfoSet modInfo, moduleList modLoaded, 
>+                         moduleDeps * modDeps){
>     char *stage2img;
>     char tmpstr1[1024], tmpstr2[1024];
>     int rc;
>+    char *cdstg2;
> 
>     /*    setupRamdisk();*/
> 
>-    /* grab the updates.img before netstg1.img so that we minimize our
>-     * ramdisk usage */
>+    /* grab the updates.img before netstg1.img so that we minimize our ramdisk usage */
>     if (!loadSingleUrlImage(ui, "images/updates.img",
>                             "/tmp/updates-disk.img", "/tmp/update-disk",
>                             "/dev/loop7", 1)) {
>@@ -138,16 +140,24 @@
> 	stage2img = "stage2.img";
>     }
> 
>-    snprintf(tmpstr1, sizeof(tmpstr1), "images/%s", stage2img);
>-    snprintf(tmpstr2, sizeof(tmpstr2), "/tmp/%s", stage2img);
>+    cdstg2 = findAnacondaCD(location, modInfo, modLoaded, *modDeps, 0);
>+
>+    if (cdstg2) {
>+        logMessage(INFO, "Found stage2.img on CD... using it...");
>+	stage2img = "stage2.img";
>+
>+    } else {
> 
>-    rc = loadSingleUrlImage(ui, tmpstr1, tmpstr2,
>+        snprintf(tmpstr1, sizeof(tmpstr1), "images/%s", stage2img);
>+        snprintf(tmpstr2, sizeof(tmpstr2), "/tmp/%s", stage2img);
>+        rc = loadSingleUrlImage(ui, tmpstr1, tmpstr2,
>                             "/mnt/runtime", "/dev/loop0", 0);
>-    if (rc) {
>-        if (rc != 2) 
>-            newtWinMessage(_("Error"), _("OK"),
>-                           _("Unable to retrieve the install image."));
>-        return 1;
>+        if (rc) {
>+            if (rc != 2) 
>+                newtWinMessage(_("Error"), _("OK"),
>+                               _("Unable to retrieve the install image."));
>+            return 1;
>+        }
>     }
> 
>     /* now verify the stamp... */
>@@ -265,7 +275,7 @@
>                 dir = 1;
>             } else {
> 		/* need to find stage 2 on remote site */
>-		if (loadUrlImages(&ui)) {
>+		if (loadUrlImages(&ui, location, modInfo, modLoaded, modDeps)) {
> 		    stage = URL_STAGE_MAIN;
> 		    dir = -1;
> 		    if (loaderData->method >= 0) {

Actions: View | Diff

Attachments on bug 397501: 289738