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

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



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Mon, 24 May 2010, Chris Lumens wrote:

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);


Ship it.

- -- David Cantrell <dcantrell redhat com>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)

iEYEARECAAYFAkv67pAACgkQ5hsjjIy1VkmhKQCfRQWwQC1RQ8avkUHTEjD/joZZ
bSUAoKYkb7PTijbGYEsr+UraDJWBMlpi
=+iP/
-----END PGP SIGNATURE-----


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