From e163bc5b3ab062e3cb22b0386dbe056ab4a54952 Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Wed, 31 Aug 2011 16:03:28 +0200 Subject: s@GFS_PREFIX"/sbin@SBIN_DIR@ $sbindir is the install path for gluster* binaries, so this is what should be used in their invocation Change-Id: Ie748b4cbf59c3ee77f721ff6e0ab7151742ce0ab BUG: 2825 Reviewed-on: http://review.gluster.com/458 Tested-by: Gluster Build System Reviewed-by: Amar Tumballi --- xlators/mgmt/glusterd/src/Makefile.am | 2 +- xlators/mgmt/glusterd/src/glusterd-mountbroker.c | 2 +- xlators/mgmt/glusterd/src/glusterd-quota.c | 2 +- xlators/mgmt/glusterd/src/glusterd-rebalance.c | 2 +- xlators/mgmt/glusterd/src/glusterd-replace-brick.c | 4 ++-- xlators/mgmt/glusterd/src/glusterd-utils.c | 6 +++--- xlators/mgmt/glusterd/src/glusterd.c | 5 ++--- 7 files changed, 11 insertions(+), 12 deletions(-) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index 95a9e7dd4..e1495c273 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 590a3f968..f847298c7 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 709f8533b..aebaef974 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 934c92773..c4d4b02bf 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 8b53fd7c4..7ae59a833 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 5963bb712..89a29abea 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 40dc2616d..d1582eae3 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; -- cgit