From d8adc66b79de3f21672884539a65327614e0c6bb Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Thu, 5 Dec 2019 16:57:28 +0300 Subject: glfsheal: install as architecture-dependent binary helper Since glfsheal is a binary helper which is not intented to be invoked directly, install it under %{libexecdir}/glusterfs rather than %{sbindir}, adjust invocation from CLI code and RPM spec. Credits: Ravishankar N . Fixes: bz#1780190 Change-Id: I4b41892d96b89c24a332470ac8c1e82f6795159a Signed-off-by: Dmitry Antipov --- cli/src/Makefile.am | 3 ++- cli/src/cli-cmd-volume.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'cli') diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index 1e27edd905..16063f27c7 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -20,7 +20,8 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ -DDATADIR=\"$(localstatedir)\" \ -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\ - -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\" + -DGLFSHEAL_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\ + -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) AM_CFLAGS = -Wall $(GF_CFLAGS) $(XML_CFLAGS) diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index 3793e5e8bf..404f71752d 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -2563,7 +2563,7 @@ cli_launch_glfs_heal(int heal_op, dict_t *options) runinit(&runner); ret = dict_get_str(options, "volname", &volname); - runner_add_args(&runner, SBIN_DIR "/glfsheal", volname, NULL); + runner_add_args(&runner, GLFSHEAL_PREFIX "/glfsheal", volname, NULL); runner_redir(&runner, STDOUT_FILENO, RUN_PIPE); switch (heal_op) { -- cgit