PATCH fix for 441556, 441546

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Don't think stage2 is copied to /tmp before the hard drive copy...
/mnt/source would be the nfs share, and /mnt/source/images might not be present.

09:01:42 INFO    : trying to mount CD device /dev/sr0 on /mnt/stage2
09:01:42 INFO : mounted loopback device /mnt/runtime on /dev/loop0 as /mnt/stage2/images/stage2.img
09:01:42 INFO    : Detected stage 2 image on CD

6:42 INFO    : Using /mnt/source/images/stage2.img as stage2 image

compiles but untested, patch attached.

Jerry
--- nfsinstall.c.orig	2008-04-11 11:16:06.000000000 -0500
+++ nfsinstall.c	2008-04-11 11:21:23.000000000 -0500
@@ -110,7 +110,7 @@
     enum { NFS_STAGE_NFS, NFS_STAGE_MOUNT, 
            NFS_STAGE_DONE } stage = NFS_STAGE_NFS;
 
-    int rc, tmp, foundinvalid = 0;
+    int rc, tmp, foundinvalid = 0, stg2cd = 0;
 
     /* JKFIXME: ASSERT -- we have a network device setup when we get here */
     while (stage != NFS_STAGE_DONE) {
@@ -169,7 +169,7 @@
                           _("Local installation media detected..."), 0);
                 sleep(3);
                 newtPopWindow();
-
+                stg2cd = 1;
                 tmp = asprintf(&fullPath, "%s:%s", host, directory);
 
                 if ((buf = isNfsIso(fullPath, mountOpts, &foundinvalid, 0)) != NULL)
@@ -229,7 +229,10 @@
                     stage2dir = strdup("/mnt/source/images");
                     buf = strdup("/mnt/source/images/stage2.img");
                 }
-
+                if ((stg2cd = 1)){
+                    stage2dir = strdup("/mnt/stage2/images");
+                    buf = strdup("/mnt/stage2/images/stage2.img");
+                }
                 winStatus(70, 3, _("Retrieving"), "%s %s...", _("Retrieving"), buf);
                 rc = copyFile(buf, "/tmp/stage2.img");
                 newtPopWindow();
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux