summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorNiklas Hambüchen <mail@nh2.me>2017-05-13 02:45:49 +0200
committerJeff Darcy <jeff@pl.atyp.us>2018-05-03 11:47:03 +0000
commitcfa4ff1417aba42f0dff3fe9d8e17acdaae4ffb2 (patch)
tree6c159c40064a2e1b04264d6501e5a66c31b59c43 /contrib
parent86a0a7e562f4f1c2f5e68c10a917aeaf1d984365 (diff)
Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes #1450546
Instead, rely on programs to be in PATH, as gluster already does in many places across its code base. Change-Id: Id21152fe42f5b67205d8f1571b0656c4d5f74246 BUG: 1450546 Signed-off-by: Niklas Hambuechen <mail@nh2.me>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/fuse-lib/mount-common.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/fuse-lib/mount-common.c b/contrib/fuse-lib/mount-common.c
index e9f80fe8154..6380dd8678e 100644
--- a/contrib/fuse-lib/mount-common.c
+++ b/contrib/fuse-lib/mount-common.c
@@ -255,16 +255,16 @@ fuse_mnt_umount (const char *progname, const char *abs_mnt,
exit (1);
}
#ifdef GF_LINUX_HOST_OS
- execl ("/bin/umount", "/bin/umount", "-i", rel_mnt,
+ execl ("umount", "umount", "-i", rel_mnt,
lazy ? "-l" : NULL, NULL);
- GFFUSE_LOGERR ("%s: failed to execute /bin/umount: %s",
+ GFFUSE_LOGERR ("%s: failed to execute umount: %s",
progname, strerror (errno));
#elif __NetBSD__
/* exitting the filesystem causes the umount */
exit (0);
#else
- execl ("/sbin/umount", "/sbin/umount", "-f", rel_mnt, NULL);
- GFFUSE_LOGERR ("%s: failed to execute /sbin/umount: %s",
+ execl ("umount", "umount", "-f", rel_mnt, NULL);
+ GFFUSE_LOGERR ("%s: failed to execute umount: %s",
progname, strerror (errno));
#endif /* GF_LINUX_HOST_OS */
exit (1);