summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cli/src/Makefile.am2
-rw-r--r--cli/src/cli-rpc-ops.c2
-rw-r--r--xlators/mgmt/glusterd/src/Makefile.am2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-mountbroker.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-quota.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-rebalance.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-replace-brick.c4
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c6
-rw-r--r--xlators/mgmt/glusterd/src/glusterd.c5
9 files changed, 13 insertions, 14 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index b50b7dbcae3..b76a9efd344 100644
--- a/cli/src/Makefile.am
+++ b/cli/src/Makefile.am
@@ -17,7 +17,7 @@ AM_CFLAGS = -fPIC -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\
-DDATADIR=\"$(localstatedir)\" \
-DCONFDIR=\"$(sysconfdir)/glusterfs\" $(GF_GLUSTERFS_CFLAGS)\
-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
- -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DGFS_PREFIX=\"$(prefix)\"
+ -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"
CLEANFILES =
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index c7bb2030e86..ccd76d57043 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -1478,7 +1478,7 @@ gf_cli3_1_print_limit_list (char *volname, char *limit_list,
/* Mount a temporary client to fetch the disk usage
* of the directory on which the limit is set.
*/
- ret = runcmd (GFS_PREFIX"/sbin/glusterfs", "-s",
+ ret = runcmd (SBIN_DIR"/glusterfs", "-s",
"localhost", "--volfile-id", volname, "-l",
DEFAULT_LOG_FILE_DIRECTORY"/quota-list.log",
mountdir, NULL);
diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
index 95a9e7dd412..e1495c273b6 100644
--- a/xlators/mgmt/glusterd/src/Makefile.am
+++ b/xlators/mgmt/glusterd/src/Makefile.am
@@ -18,7 +18,7 @@ noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h glusterd-sm.h \
AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)\
-I$(rpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/rpc/xdr/src\
- -I$(top_srcdir)/rpc/rpc-lib/src -I$(CONTRIBDIR)/uuid -I$(top_srcdir)/contrib/md5 -DGFS_PREFIX=\"$(prefix)\" \
+ -I$(top_srcdir)/rpc/rpc-lib/src -I$(CONTRIBDIR)/uuid -I$(top_srcdir)/contrib/md5 -DSBIN_DIR=\"$(sbindir)\"\
-DDATADIR=\"$(localstatedir)\" -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
-DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(LIBXML2_CFLAGS)
diff --git a/xlators/mgmt/glusterd/src/glusterd-mountbroker.c b/xlators/mgmt/glusterd/src/glusterd-mountbroker.c
index 590a3f96848..f847298c7d0 100644
--- a/xlators/mgmt/glusterd/src/glusterd-mountbroker.c
+++ b/xlators/mgmt/glusterd/src/glusterd-mountbroker.c
@@ -634,7 +634,7 @@ glusterd_do_mount (char *label, dict_t *argdict, char **path, int *op_errno)
/** invoke glusterfs on the mountpoint */
runinit (&runner);
- runner_add_arg (&runner, GFS_PREFIX"/sbin/glusterfs");
+ runner_add_arg (&runner, SBIN_DIR"/glusterfs");
seq_dict_foreach (argdict, _runner_add, &runner);
runner_add_arg (&runner, mtptemp);
ret = runner_run_reuse (&runner);
diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c
index 709f8533bc3..aebaef974ad 100644
--- a/xlators/mgmt/glusterd/src/glusterd-quota.c
+++ b/xlators/mgmt/glusterd/src/glusterd-quota.c
@@ -262,7 +262,7 @@ glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv, char *volname)
}
runinit (&runner);
- runner_add_args (&runner, GFS_PREFIX"/sbin/glusterfs", "-s",
+ runner_add_args (&runner, SBIN_DIR"/glusterfs", "-s",
"localhost", "--volfile-id", volname, "-l",
DEFAULT_LOG_FILE_DIRECTORY"/quota-crawl.log",
mountdir, NULL);
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
index 934c927732a..c4d4b02bf39 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -556,7 +556,7 @@ glusterd_handle_defrag_start (glusterd_volinfo_t *volinfo, char *op_errstr,
runner_end (&runner);
runinit (&runner);
- runner_add_args (&runner, GFS_PREFIX"/sbin/glusterfs",
+ runner_add_args (&runner, SBIN_DIR"/glusterfs",
"-s", "localhost", "--volfile-id", volinfo->volname,
"--xlator-option", "*dht.use-readdirp=yes",
"--xlator-option", "*dht.lookup-unhashed=yes",
diff --git a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
index 8b53fd7c4ae..7ae59a833d5 100644
--- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
+++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
@@ -639,7 +639,7 @@ rb_spawn_dst_brick (glusterd_volinfo_t *volinfo,
GF_ASSERT (port);
runinit (&runner);
- runner_add_arg (&runner, GFS_PREFIX"/sbin/glusterfs");
+ runner_add_arg (&runner, SBIN_DIR"/glusterfs");
runner_argprintf (&runner, "-f" "%s/vols/%s/"RB_DSTBRICKVOL_FILENAME,
priv->workdir, volinfo->volname);
runner_argprintf (&runner, "-p" "%s/vols/%s/"RB_DSTBRICK_PIDFILE,
@@ -677,7 +677,7 @@ rb_spawn_glusterfs_client (glusterd_volinfo_t *volinfo,
priv = THIS->private;
runinit (&runner);
- runner_add_arg (&runner, GFS_PREFIX"/sbin/glusterfs");
+ runner_add_arg (&runner, SBIN_DIR"/glusterfs");
runner_argprintf (&runner, "-f" "%s/vols/%s/"RB_CLIENTVOL_FILENAME,
priv->workdir, volinfo->volname);
runner_argprintf (&runner, "%s/vols/%s/"RB_CLIENT_MOUNTPOINT,
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 5963bb712bc..89a29abea78 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -1159,7 +1159,7 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo,
runner_argprintf (&runner, "--log-file=%s", valgrind_logfile);
}
#endif
- runner_add_args (&runner, GFS_PREFIX"/sbin/glusterfsd",
+ runner_add_args (&runner, SBIN_DIR"/glusterfsd",
"-s", "localhost", "--volfile-id", volfile,
"-p", pidfile, "-S", socketpath,
"--brick-name", brickinfo->path,
@@ -2409,11 +2409,11 @@ glusterd_nodesvc_start (char *server, gf_boolean_t pmap_signin)
snprintf (volfileid, sizeof (volfileid), "gluster/%s", server);
if (pmap_signin)
- ret = runcmd (GFS_PREFIX"/sbin/glusterfs", "-s", "localhost",
+ ret = runcmd (SBIN_DIR"/glusterfs", "-s", "localhost",
"--volfile-id", volfileid,
"-p", pidfile, "-l", logfile, NULL);
else
- ret = runcmd (GFS_PREFIX"/sbin/glusterfs", "-f", volfile,
+ ret = runcmd (SBIN_DIR"/glusterfs", "-f", volfile,
"-p", pidfile, "-l", logfile, NULL);
out:
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
index 40dc2616d7e..d1582eae38a 100644
--- a/xlators/mgmt/glusterd/src/glusterd.c
+++ b/xlators/mgmt/glusterd/src/glusterd.c
@@ -480,9 +480,8 @@ configure_syncdaemon (glusterd_conf_t *conf)
RUN_GSYNCD_CMD;
/* gluster-command-dir */
- /* XXX $sbindir should be used (throughout the codebase) */
runinit_gsyncd_setrx (&runner, conf);
- runner_add_args (&runner, "gluster-command-dir", GFS_PREFIX"/sbin/",
+ runner_add_args (&runner, "gluster-command-dir", SBIN_DIR"/",
".", ".", NULL);
RUN_GSYNCD_CMD;
@@ -539,7 +538,7 @@ configure_syncdaemon (glusterd_conf_t *conf)
/* gluster-command-dir */
runinit_gsyncd_setrx (&runner, conf);
- runner_add_args (&runner, "gluster-command-dir", GFS_PREFIX"/sbin/",
+ runner_add_args (&runner, "gluster-command-dir", SBIN_DIR"/",
".", NULL);
RUN_GSYNCD_CMD;
generated by cgit (git 2.34.1) at 2024-11-11 18:11:58 +0000