diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2019-12-05 16:57:28 +0300 |
|---|---|---|
| committer | Amar Tumballi <amarts@gmail.com> | 2019-12-19 11:11:50 +0000 |
| commit | d8adc66b79de3f21672884539a65327614e0c6bb (patch) | |
| tree | ec9f4dfec72a2d595375018afcd46a70c824aa48 | |
| parent | bc6e206c6d29234a0b167b142d20c62ffd529f15 (diff) | |
| download | glusterfs-d8adc66b79de3f21672884539a65327614e0c6bb.tar.gz glusterfs-d8adc66b79de3f21672884539a65327614e0c6bb.tar.xz glusterfs-d8adc66b79de3f21672884539a65327614e0c6bb.zip | |
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 <ravishankar@redhat.com>.
Fixes: bz#1780190
Change-Id: I4b41892d96b89c24a332470ac8c1e82f6795159a
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
| -rw-r--r-- | cli/src/Makefile.am | 3 | ||||
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 2 | ||||
| -rw-r--r-- | glusterfs.spec.in | 2 | ||||
| -rw-r--r-- | heal/src/Makefile.am | 6 |
4 files changed, 7 insertions, 6 deletions
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) { diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 7ff4294fc2..e6cd363686 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1305,7 +1305,7 @@ exit 0 # binaries %{_sbindir}/glusterd -%{_sbindir}/glfsheal +%{_libexecdir}/glusterfs/glfsheal %{_sbindir}/gf_attach %{_sbindir}/gluster-setgfid2path # {_sbindir}/glusterfsd is the actual binary, but glusterfs (client) is a diff --git a/heal/src/Makefile.am b/heal/src/Makefile.am index f04a294cc5..aa18d3eff8 100644 --- a/heal/src/Makefile.am +++ b/heal/src/Makefile.am @@ -1,5 +1,6 @@ if WITH_SERVER -sbin_PROGRAMS = glfsheal +scriptdir = $(GLUSTERFS_LIBEXECDIR) +script_PROGRAMS = glfsheal endif glfsheal_SOURCES = glfs-heal.c @@ -18,8 +19,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_srcdir)/rpc/xdr/src\ -I$(top_builddir)/rpc/xdr/src\ -I$(top_srcdir)/api/src\ - -DDATADIR=\"$(localstatedir)\" \ - -DSBIN_DIR=\"$(sbindir)\" + -DDATADIR=\"$(localstatedir)\" AM_CFLAGS = -Wall $(GF_CFLAGS) $(XML_CFLAGS) |