summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--doc/glusterd.vol2
-rw-r--r--glusterfs.spec.in5
-rwxr-xr-xsmoke.sh2
-rw-r--r--xlators/mgmt/glusterd/src/Makefile.am8
5 files changed, 15 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 27a2508..893a47f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -533,6 +533,8 @@ AC_SUBST(INCLUDES)
AM_CONDITIONAL([GF_DARWIN_HOST_OS], test "${GF_HOST_OS}" = "GF_DARWIN_HOST_OS")
+AM_CONDITIONAL([GF_INSTALL_VAR_LIB_GLUSTERD], test ! -d /var/lib/glusterd && test -d /etc/glusterd )
+
AC_OUTPUT
echo
diff --git a/doc/glusterd.vol b/doc/glusterd.vol
index 809042c..de17d8f 100644
--- a/doc/glusterd.vol
+++ b/doc/glusterd.vol
@@ -1,6 +1,6 @@
volume management
type mgmt/glusterd
- option working-directory /etc/glusterd
+ option working-directory /var/lib/glusterd
option transport-type socket,rdma
option transport.socket.keepalive-time 10
option transport.socket.keepalive-interval 2
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 4a2320b..c425e06 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -304,8 +304,9 @@ fi
# Move legacy sysconf files to the correct sysconfdir
if [ -d /etc/glusterd ]; then
- cp -a /etc/glusterd /var/lib/
- mv /etc/glusterd /etc/glusterd.rpmsave
+ mkdir -p /var/lib
+ mv /etc/glusterd /var/lib/
+ ln -sf /var/lib/glusterd /etc/glusterd
fi
if [ -d /var/lib/glusterd/vols ]; then
diff --git a/smoke.sh b/smoke.sh
index 5080f59..a87908d 100755
--- a/smoke.sh
+++ b/smoke.sh
@@ -14,7 +14,7 @@ function cleanup()
killall -15 glusterfs glusterfsd glusterd glusterd 2>&1 || true;
killall -9 glusterfs glusterfsd glusterd glusterd 2>&1 || true;
umount -l $M 2>&1 || true;
- rm -rf /etc/glusterd $P/export;
+ rm -rf /var/lib/glusterd /etc/glusterd $P/export;
}
function start_fs()
diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
index d1dbf58..485350b 100644
--- a/xlators/mgmt/glusterd/src/Makefile.am
+++ b/xlators/mgmt/glusterd/src/Makefile.am
@@ -30,3 +30,11 @@ AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
CLEANFILES =
+
+install-data-hook:
+
+if GF_INSTALL_VAR_LIB_GLUSTERD
+ $(mkdir_p) /var/lib/
+ (stat /etc/glusterd && mv /etc/glusterd /var/lib/) || true;
+ (ln -sf /var/lib/glusterd /etc/glusterd) || true;
+endif