From 3adeb0a15057b97fed75c293a1a85439dc235c31 Mon Sep 17 00:00:00 2001 From: Aravinda VK Date: Wed, 27 Jan 2016 15:08:03 +0530 Subject: geo-rep: Fix gsyncd prefix in gsec_create gsec_create script is generated after running ./configure libexec dir was formed using $prefix/libexec, but in Debian based distributions libexec dir is not present, instead they use lib directory to store these scripts. With this patch, full libexec path is fetched during ./configure. BUG: 1304692 Change-Id: I9f47a38e6ab0027c7df6716136fbe0635e95a593 Signed-off-by: Aravinda VK Reviewed-on: http://review.gluster.org/13298 Smoke: Gluster Build System Tested-by: Raghavendra Talur CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Kaleb KEITHLEY (cherry picked from commit 453abcb821b712f849f91a2a370a4debff89eed2) Reviewed-on: http://review.gluster.org/13354 --- geo-replication/src/peer_gsec_create.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'geo-replication') diff --git a/geo-replication/src/peer_gsec_create.in b/geo-replication/src/peer_gsec_create.in index 97c4333d69c..05c1638bdcd 100755 --- a/geo-replication/src/peer_gsec_create.in +++ b/geo-replication/src/peer_gsec_create.in @@ -2,6 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ +libexecdir=@libexecdir@ if [ ! -f "$GLUSTERD_WORKDIR"/geo-replication/secret.pem.pub ]; then \rm -rf "$GLUSTERD_WORKDIR"/geo-replication/secret.pem* @@ -17,7 +18,7 @@ if [ "Xcontainer" = "X$1" ]; then output1=`cat "$GLUSTERD_WORKDIR"/geo-replication/secret.pem.pub` output2=`cat "$GLUSTERD_WORKDIR"/geo-replication/tar_ssh.pem.pub` else - output1=`echo command=\"${exec_prefix}/libexec/glusterfs/gsyncd\" " "``cat "$GLUSTERD_WORKDIR"/geo-replication/secret.pem.pub` + output1=`echo command=\"${libexecdir}/glusterfs/gsyncd\" " "``cat "$GLUSTERD_WORKDIR"/geo-replication/secret.pem.pub` output2=`echo command=\"tar \$\{SSH_ORIGINAL_COMMAND#* \}\" " "``cat "$GLUSTERD_WORKDIR"/geo-replication/tar_ssh.pem.pub` fi echo -e "$output1\n$output2" -- cgit