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

[PATCH rhel6-branch master] On NFS installs, look for product.img and updates.img under images/ (#594811).



We were previously trying to look for these two up a directory level by
trimming off more of the path than needed.
---
 loader/nfsinstall.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
index f609a7d..660106a 100644
--- a/loader/nfsinstall.c
+++ b/loader/nfsinstall.c
@@ -324,16 +324,12 @@ char * mountNfsImage(struct installMethod * method,
 
             free(buf);
 
-            checked_asprintf(&buf, "%.*s/updates.img",
-                             (int) (strrchr(fullPath, '/')-fullPath),
-                             fullPath);
+            checked_asprintf(&buf, "%s/updates.img", fullPath);
             logMessage(INFO, "Looking for updates in %s", buf);
             copyUpdatesImg(buf);
             free(buf);
 
-            checked_asprintf(&buf, "%.*s/product.img",
-                             (int) (strrchr(fullPath, '/')-fullPath),
-                             fullPath);
+            checked_asprintf(&buf, "%s/product.img", fullPath);
             logMessage(INFO, "Looking for product in %s", buf);
             copyProductImg(buf);
             free(buf);
-- 
1.7.0.1


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