diff options
| author | Aravinda VK <avishwan@redhat.com> | 2016-01-27 15:08:03 +0530 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-02-04 03:16:26 -0800 |
| commit | 453abcb821b712f849f91a2a370a4debff89eed2 (patch) | |
| tree | 6862ba7b1d5ea3265546e839b819933b37545963 | |
| parent | cf914bbf07e329001fd5a844ef9c2c25d17ed131 (diff) | |
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: 1162905
Change-Id: I9f47a38e6ab0027c7df6716136fbe0635e95a593
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: http://review.gluster.org/13298
Smoke: Gluster Build System <jenkins@build.gluster.com>
Tested-by: Raghavendra Talur <rtalur@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
| -rwxr-xr-x | geo-replication/src/peer_gsec_create.in | 3 |
1 files changed, 2 insertions, 1 deletions
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" |