summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2018-07-24 14:40:51 -0400
committerShyamsundar Ranganathan <srangana@redhat.com>2018-07-25 18:21:57 +0000
commit48d0fdaa2b92008c6e907aee9e5382c0bcc3e1c5 (patch)
tree530a25c03a0a68bf2c3c040335ec37f3443323f7
parentabd7b1393294d29eef6913e7f93ab76040c90428 (diff)
georep: fix hard-coded paths in gsyncd.conf.in
This is part of the reason why we use autoconf (i.e. configure). For an ordinary clone+autogen.sh+configure SBIN_DIR is /usr/local/sbin; for an rpm or dpkg build it will be /usr/sbin. I wonder how many more are lurking in our sources? /usr/libexec is one that frequently bites us on Debian and Ubuntu, which don't have /usr/libexec. (But it's all Linux, right?) See https://bugzilla.redhat.com/show_bug.cgi?id=1601532 Reported-by: lohmaier+rhbz@gmail.com Change-Id: I6523894416cc06236ea1f99529efd36e957bd98e updates: bz#1193929 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
-rw-r--r--geo-replication/gsyncd.conf.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/geo-replication/gsyncd.conf.in b/geo-replication/gsyncd.conf.in
index 0a842cf2be3..bd04400ff69 100644
--- a/geo-replication/gsyncd.conf.in
+++ b/geo-replication/gsyncd.conf.in
@@ -138,11 +138,11 @@ value =
help=If SSH keys are not secured with gsyncd prefix then use this configuration to set the actual path of gsyncd(Usually /usr/libexec/glusterfs/gsyncd)
[gluster-command-dir]
-value=/usr/local/sbin/
+value=@SBIN_DIR@
help=Directory where Gluster binaries exist on master
[slave-gluster-command-dir]
-value=/usr/local/sbin/
+value=@SBIN_DIR@
help=Directory where Gluster binaries exist on slave
[gluster-params]