diff options
| author | Amar Tumballi <amar@gluster.com> | 2012-05-15 22:12:53 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-05-29 22:08:14 -0700 |
| commit | 1c2624a3ff8a0d72bc88b1b869c255e3ca4c395d (patch) | |
| tree | 6d46b2ada4eeb3131b61c642844fb8a3c348dc8a | |
| parent | c31447bda4e5e0b8e40689db9635fc5c0aa04136 (diff) | |
glusterd: change working-directory from /etc/glusterd to /var/lib/glusterd
as it is changed in RPM based install (using spec file), makes sense to do
it everywhere, even in source install
Change-Id: Ibe5ebd860b1529aca295b79d683a3b2e6797506c
Signed-off-by: Amar Tumballi <amar@gluster.com>
BUG: 824231
Reviewed-on: http://review.gluster.com/3338
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/glusterd.vol | 2 | ||||
| -rw-r--r-- | glusterfs.spec.in | 5 | ||||
| -rwxr-xr-x | smoke.sh | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/Makefile.am | 8 |
5 files changed, 15 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f8f270b9f..2d3136a9d 100644 --- a/configure.ac +++ b/configure.ac @@ -539,6 +539,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 809042cbd..de17d8fd8 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 0c2b5b344..8d0174840 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 @@ -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 d1dbf5842..6a0f2d754 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/log/glusterd /etc/glusterd) || true; +endif |