From 7f950ed3ae4f99542ba4bbabec5fc1a86850a528 Mon Sep 17 00:00:00 2001
From: Meghana Madhusudhan <mmadhusu@redhat.com>
Date: Thu, 7 May 2015 15:34:06 +0530
Subject: 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>
---
 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 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
 }
 
 
-- 
cgit