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

Re: [PATCH rhel6-branch] Look for updates.img and product.img on NFS installs.



On 05/12/2010 08:39 PM, Chris Lumens wrote:
Related: rhbz#587696
---
  loader/nfsinstall.c |   19 +++++++++++++++++--
  1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
index e4b2396..4337ddc 100644
--- a/loader/nfsinstall.c
+++ b/loader/nfsinstall.c
@@ -311,8 +311,7 @@ char * mountNfsImage(struct installMethod * method,
              checked_asprintf(&buf, "%.*s/RHupdates",
                               (int) (strrchr(fullPath, '/')-fullPath),
                               fullPath);
-
-            logMessage(INFO, "mounting nfs path %s for updates", buf);
+            logMessage(INFO, "Looking for updates in %s", buf);

              if (!doPwMount(buf, "/tmp/update-disk", "nfs", mountOpts, NULL)) {
                  logMessage(INFO, "Using RHupdates/ for NFS install");
@@ -323,6 +322,22 @@ char * mountNfsImage(struct installMethod * method,
                  logMessage(INFO, "No RHupdates/ directory found, skipping");
              }

+            free(buf);
+
+            checked_asprintf(&buf, "%.*s/updates.img",
+                             (int) (strrchr(fullPath, '/')-fullPath),
+                             fullPath):
+            logMessage(INFO, "Looking for updates in %s", buf);
+            copyUpdatesImg(buf);
+            free(buf);
+
+            checked_asprintf(&buf, "%.*s/product.img",
+                             (int) (strrchr(fullPath, '/')-fullPath),
+                             fullPath):
+            logMessage(INFO, "Looking for product in %s", buf);
+            copyProductImg(buf);
+            free(buf);
+
              stage = NFS_STAGE_DONE;
              break;
          }

Ack.

Ales


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