summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiffin Tony Thottan <jthottan@redhat.com>2016-12-20 10:42:31 +0530
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-12-22 14:04:04 -0800
commitf3c2d3877de7c364e87c27fbbb08d4c797927444 (patch)
treeac0e4ad777ed897e98abd6977552bca8edfd8c8a
parent5a65416b14da7b06aff9319f39c5c4f4e7c884fb (diff)
ganesha/scripts : Prevent removal of entries in ganesha.conf during deletion of a node
Upstream reference : >Change-Id: Ia6c653eeb9bef7ff4107757f845218c2316db2e4 >BUG: 1406249 >Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com> >Reviewed-on: http://review.gluster.org/16209 >Smoke: Gluster Build System <jenkins@build.gluster.org> >NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> >CentOS-regression: Gluster Build System <jenkins@build.gluster.org> >Reviewed-by: soumya k <skoduri@redhat.com> >(cherry picked from commit 8b42e1b5688f8600086ecc0e33ac4abf5e7c2772) Change-Id: Ia6c653eeb9bef7ff4107757f845218c2316db2e4 BUG: 1408111 Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com> Reviewed-on: http://review.gluster.org/16268 Reviewed-by: soumya k <skoduri@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
-rw-r--r--extras/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 bd8c8979e40..aab5dad6975 100644
--- a/extras/ganesha/scripts/ganesha-ha.sh
+++ b/extras/ganesha/scripts/ganesha-ha.sh
@@ -968,8 +968,8 @@ create_ganesha_conf_file()
else
# Restoring previous file
rm -rf $GANESHA_CONF
- sed -r -i -e '/^%include[[:space:]]+".+\.conf"$/d' $HA_CONFDIR/ganesha.conf
cp $HA_CONFDIR/ganesha.conf $GANESHA_CONF
+ sed -r -i -e '/^%include[[:space:]]+".+\.conf"$/d' $GANESHA_CONF
fi
}