@@ -1,138 +0,0 @@
1−From 616381bc25b0e90198683fb049f994e82d467d96 Mon Sep 17 00:00:00 2001
2−From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
3−Date: Sat, 13 May 2017 02:45:49 +0200
4−Subject: [PATCH] Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes
5− #1450546.
6−
7−Instead, rely on programs to be in PATH, as gluster already
8−does in many places across its code base.
9−
10−Change-Id: Id21152fe42f5b67205d8f1571b0656c4d5f74246
11−---
12− contrib/fuse-lib/mount-common.c | 8 ++++----
13− xlators/mgmt/glusterd/src/glusterd-ganesha.c | 6 +++---
14− xlators/mgmt/glusterd/src/glusterd-quota.c | 6 +++---
15− xlators/mgmt/glusterd/src/glusterd-snapshot.c | 4 ++--
16− xlators/mgmt/glusterd/src/glusterd-utils.c | 14 +-------------
17− 5 files changed, 13 insertions(+), 25 deletions(-)
18−
19−diff --git a/contrib/fuse-lib/mount-common.c b/contrib/fuse-lib/mount-common.c
20−index e9f80fe81..6380dd867 100644
21−--- a/contrib/fuse-lib/mount-common.c
22−+++ b/contrib/fuse-lib/mount-common.c
23−@@ -255,16 +255,16 @@ fuse_mnt_umount (const char *progname, const char *abs_mnt,
24− exit (1);
25− }
26− #ifdef GF_LINUX_HOST_OS
27−- execl ("/bin/umount", "/bin/umount", "-i", rel_mnt,
28−+ execl ("umount", "umount", "-i", rel_mnt,
29− lazy ? "-l" : NULL, NULL);
30−- GFFUSE_LOGERR ("%s: failed to execute /bin/umount: %s",
31−+ GFFUSE_LOGERR ("%s: failed to execute umount: %s",
32− progname, strerror (errno));
33− #elif __NetBSD__
34− /* exitting the filesystem causes the umount */
35− exit (0);
36− #else
37−- execl ("/sbin/umount", "/sbin/umount", "-f", rel_mnt, NULL);
38−- GFFUSE_LOGERR ("%s: failed to execute /sbin/umount: %s",
39−+ execl ("umount", "umount", "-f", rel_mnt, NULL);
40−+ GFFUSE_LOGERR ("%s: failed to execute umount: %s",
41− progname, strerror (errno));
42− #endif /* GF_LINUX_HOST_OS */
43− exit (1);
44−diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c
45−index 0e6629cf0..fcb4738b7 100644
46−--- a/xlators/mgmt/glusterd/src/glusterd-quota.c
47−+++ b/xlators/mgmt/glusterd/src/glusterd-quota.c
48−@@ -30,7 +30,7 @@
49−
50− #ifndef _PATH_SETFATTR
51− # ifdef GF_LINUX_HOST_OS
52−-# define _PATH_SETFATTR "/usr/bin/setfattr"
53−+# define _PATH_SETFATTR "setfattr"
54− # endif
55− # ifdef __NetBSD__
56− # define _PATH_SETFATTR "/usr/pkg/bin/setfattr"
57−@@ -335,7 +335,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv,
58−
59− if (type == GF_QUOTA_OPTION_TYPE_ENABLE ||
60− type == GF_QUOTA_OPTION_TYPE_ENABLE_OBJECTS)
61−- runner_add_args (&runner, "/usr/bin/find", ".", NULL);
62−+ runner_add_args (&runner, "find", ".", NULL);
63−
64− else if (type == GF_QUOTA_OPTION_TYPE_DISABLE) {
65−
66−@@ -351,7 +351,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv,
67− VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "1",
68− "{}", "\\", ";", NULL);
69− #else
70−- runner_add_args (&runner, "/usr/bin/find", ".",
71−+ runner_add_args (&runner, "find", ".",
72− "-exec", _PATH_SETFATTR, "-n",
73− VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "-v",
74− "1", "{}", "\\", ";", NULL);
75−diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
76−index da0152366..f0d135350 100644
77−--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
78−+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
79−@@ -121,7 +121,7 @@ glusterd_build_snap_device_path (char *device, char *snapname,
80− }
81−
82− runinit (&runner);
83−- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "vg_name",
84−+ runner_add_args (&runner, "lvs", "--noheadings", "-o", "vg_name",
85− device, NULL);
86− runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
87− snprintf (msg, sizeof (msg), "Get volume group for device %s", device);
88−@@ -1982,7 +1982,7 @@ glusterd_is_thinp_brick (char *device, uint32_t *op_errno)
89−
90− runinit (&runner);
91−
92−- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "pool_lv",
93−+ runner_add_args (&runner, "lvs", "--noheadings", "-o", "pool_lv",
94− device, NULL);
95− runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
96− runner_log (&runner, this->name, GF_LOG_DEBUG, msg);
97−diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
98−index 51db13df0..6fa7b92f9 100644
99−--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
100−+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
101−@@ -6027,7 +6027,6 @@ static struct fs_info {
102− char *fs_tool_pattern;
103− char *fs_tool_pkg;
104− } glusterd_fs[] = {
105−- /* some linux have these in /usr/sbin/and others in /sbin/? */
106− { "xfs", "xfs_info", NULL, "isize=", "xfsprogs" },
107− { "ext3", "tune2fs", "-l", "Inode size:", "e2fsprogs" },
108− { "ext4", "tune2fs", "-l", "Inode size:", "e2fsprogs" },
109−@@ -6048,7 +6047,6 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
110− char *trail = NULL;
111− runner_t runner = {0, };
112− struct fs_info *fs = NULL;
113−- char fs_tool_name[256] = {0, };
114− static dict_t *cached_fs = NULL;
115−
116− memset (key, 0, sizeof (key));
117−@@ -6085,17 +6083,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
118− cur_word = "N/A";
119− goto cached;
120− }
121−-
122−- snprintf (fs_tool_name, sizeof (fs_tool_name),
123−- "/usr/sbin/%s", fs->fs_tool_name);
124−- if (sys_access (fs_tool_name, R_OK|X_OK) == 0)
125−- runner_add_arg (&runner, fs_tool_name);
126−- else {
127−- snprintf (fs_tool_name, sizeof (fs_tool_name),
128−- "/sbin/%s", fs->fs_tool_name);
129−- if (sys_access (fs_tool_name, R_OK|X_OK) == 0)
130−- runner_add_arg (&runner, fs_tool_name);
131−- }
132−+ runner_add_arg (&runner, fs->fs_tool_name);
133− break;
134− }
135− }
136−--
137−2.12.0
138−