Attachment 298731 Details for Bug 438377 – patch

[patch] patch

anaconda-use-stage2-in-place.patch (text/plain), 2.09 KB, created by David Woodhouse on 2008-03-20 18:49:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2008-03-20 18:49:40 UTC

Size: 2.09 KB

patch

obsolete

>diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c
>index 67f0cda..1b8bd62 100644
>--- a/loader2/nfsinstall.c
>+++ b/loader2/nfsinstall.c
>@@ -212,19 +212,22 @@ char * mountNfsImage(struct installMethod * method,
>                     buf = strdup("/mnt/source/images/stage2.img");
>                 }
> 
>-                winStatus(70, 3, _("Retrieving"), "%s %s...", _("Retrieving"), buf);
>-                rc = copyFile(buf, "/tmp/stage2.img");
>-                newtPopWindow();
>+		rc = access(buf, R_OK);
> 
>                 free(stage2dir);
> 
>                 if (!rc) {
>                     logMessage(INFO, "can access %s", buf);
>-                    rc = mountStage2("/tmp/stage2.img", stage2dir);
>+                    rc = mountStage2(buf, stage2dir);
>+
>+		    if (rc == 1) {
>+			    logMessage(WARNING, "unable to mount %s", buf);
>+			    goto trynfsiso;
>+		    }
> 
>                     free(buf);
> 
>-                    if (rc && rc == -1) {
>+                    if (rc == -1) {
>                         foundinvalid = 1;
>                         logMessage(WARNING, "not the right one");
>                         umount("/mnt/source");
>@@ -237,6 +240,7 @@ char * mountNfsImage(struct installMethod * method,
>                     char *path;
> 
>                     logMessage(WARNING, "unable to access %s", buf);
>+		trynfsiso:
>                     free(buf);
>                     umount("/mnt/source");
> 
>diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c
>index 90d7917..a239e19 100644
>--- a/loader2/urlinstall.c
>+++ b/loader2/urlinstall.c
>@@ -205,7 +205,7 @@ static int loadUrlImages(struct iurlinfo * ui) {
> char * mountUrlImage(struct installMethod * method,
>                      char * location, struct loaderData_s * loaderData) {
>     int rc;
>-    char *url, *buf;
>+    char *url;
>     struct iurlinfo ui;
>     char needsSecondary = ' ';
>     char * cdurl = NULL;
>@@ -275,7 +275,6 @@ char * mountUrlImage(struct installMethod * method,
> 			  _("Local installation media detected..."), 0);
> 		sleep(3);
> 		newtPopWindow();
>-                free(buf);
> 
>                 stage = URL_STAGE_DONE;
>             } else {

Actions: View | Diff

Attachments on bug 438377: 298731