From cfe56c96ff435f916a7017f3252717cf0df151d9 Mon Sep 17 00:00:00 2001 From: Meghana Madhusudhan Date: Wed, 6 May 2015 10:08:54 +0530 Subject: NFS-Ganesha : Do not empty global config file when cluster is torn The global config file will need new blocks to support client lock recovery. Current cleanup function empties the entire file. Deleting only "include" lines in the config file. This is the backport of the patch, http://review.gluster.org/#/c/10630/ Change-Id: I15f7a7aa7bc4f2362abd15b28a8b709d93dc3d37 BUG: 1218857 Signed-off-by: Meghana Madhusudhan Reviewed-on: http://review.gluster.org/10593 Reviewed-by: jiffin tony Thottan Reviewed-by: Niels de Vos Tested-by: Gluster Build System --- extras/ganesha/scripts/ganesha-ha.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extras') diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index 950aeb0362a..e8160f4c99e 100755 --- a/extras/ganesha/scripts/ganesha-ha.sh +++ b/extras/ganesha/scripts/ganesha-ha.sh @@ -198,7 +198,7 @@ cleanup_ganesha_config () rm -rf ${HA_CONFDIR}/exports/*.conf rm -rf ${HA_CONFDIR}/.export_added rm -rf /etc/cluster/cluster.conf* - > $CONF + sed -r -i -e '/^%include[[:space:]]+".+\.conf"$/d' $CONF } -- cgit