andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glusterd: change working-directory from /etc/glusterd to /var/lib/glusterd

Browse Source 
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>
This commit is contained in:
Amar Tumballi 2012-05-15 22:12:53 +05:30 committed by Vijay Bellur
parent c31447bda4
commit 1c2624a3ff
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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

2
doc/glusterd.vol
View File

@ -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

5
glusterfs.spec.in
View File

@ -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

2
smoke.sh
View File

@ -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()

8
xlators/mgmt/glusterd/src/Makefile.am
View File

@ -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