From 5136c938dddd909ad7a998afa643dc3dcaa6233d Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Sat, 20 Sep 2014 06:57:24 +0200 Subject: Do not hardcode setfattr(1) path Turn setfattr(1) absolute path into an OS-dependant macro. Let compiler option override it to fit custom installation if needed. BUG: 1129939 Change-Id: I8f469c5741a85b6e8d8f6299a9540b3d64611d2f Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/8786 Tested-by: Gluster Build System Reviewed-by: Jeff Darcy Reviewed-by: Vijay Bellur --- xlators/mgmt/glusterd/src/glusterd-quota.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-quota.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c index f2f742ddaf2..a6712aa7900 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c +++ b/xlators/mgmt/glusterd/src/glusterd-quota.c @@ -28,6 +28,18 @@ #include #include +#ifndef _PATH_SETFATTR +# ifdef GF_LINUX_HOST_OS +# define _PATH_SETFATTR "/usr/bin/setfattr" +# endif +# ifdef __NetBSD__ +# define _PATH_SETFATTR "/usr/pkg/bin/setfattr" +# endif +# ifdef __FreeBSD__ +# define _PATH_SETFATTR "/usr/local/bin/setfattr" +# endif +#endif + /* Any negative pid to make it special client */ #define QUOTA_CRAWL_PID "-100" @@ -223,7 +235,7 @@ glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv, char *volname, else if (type == GF_QUOTA_OPTION_TYPE_DISABLE) runner_add_args (&runner, "/usr/bin/find", ".", - "-exec", "/usr/bin/setfattr", "-n", + "-exec", _PATH_SETFATTR, "-n", VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "-v", "1", "{}", "\\", ";", NULL); -- cgit