summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorMeghana Madhusudhan <mmadhusu@redhat.com>2015-05-07 15:34:06 +0530
committerNiels de Vos <ndevos@redhat.com>2015-05-07 08:37:52 -0700
commit7f950ed3ae4f99542ba4bbabec5fc1a86850a528 (patch)
treec1979ec28ed7714946d58b7934bcad308399780b /extras
parent4c6e9c5f8d62444412c86545868cdb5bf6a06b39 (diff)
NFS-Ganesha : Improved sed expression in cleanup
The global config file should not be emptied when tear down is called. Improving the sed expression to delete the ".conf" files only Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com> Change-Id: Ida3d303f629cb512c02dadacce1ec7e5f07db018 BUG: 1218854 Reviewed-on: http://review.gluster.org/10630 Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: soumya k <skoduri@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'extras')
-rwxr-xr-xextras/ganesha/scripts/ganesha-ha.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
index 5a633a6594c..79a99c49c33 100755
--- a/extras/ganesha/scripts/ganesha-ha.sh
+++ b/extras/ganesha/scripts/ganesha-ha.sh
@@ -235,7 +235,7 @@ cleanup_ganesha_config ()
rm -rf ${HA_CONFDIR}/exports/*.conf
rm -rf ${HA_CONFDIR}/.export_added
rm -rf /etc/cluster/cluster.conf*
- sed -i /.conf/d $CONF
+ sed -r -i -e '/^%include[[:space:]]+".+\.conf"$/d' $CONF
}