From f1ffd9a0bbd4989a36dca2fd707226c240a16ec5 Mon Sep 17 00:00:00 2001 From: Jiffin Tony Thottan Date: Thu, 5 May 2016 14:52:32 +0530 Subject: NFS-Ganesha : Parse the Export_Id correctly for unexporting volume Currently export id parsed using "cut -d ' ' -f8" which might endup in giving wrong value. In case of multiple space chracter, output may differ. In this all those instance will replaced by awk call Upstream reference : >Change-Id: I60dea8ce116900da3c1fc9badf898e51183a2ca1 >BUG: 1333319 >Signed-off-by: Jiffin Tony Thottan >Reviewed-on: http://review.gluster.org/14225 >Smoke: Gluster Build System >NetBSD-regression: NetBSD Build System >CentOS-regression: Gluster Build System >Reviewed-by: soumya k >Reviewed-by: Kaleb KEITHLEY >(cherry picked from commit 5440bad91026f27399df51856176aef85c1fcf4d) Change-Id: I60dea8ce116900da3c1fc9badf898e51183a2ca1 BUG: 1336798 Signed-off-by: Jiffin Tony Thottan Reviewed-on: http://review.gluster.org/14396 Smoke: Gluster Build System Reviewed-by: Kaleb KEITHLEY Tested-by: Kaleb KEITHLEY NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- extras/ganesha/scripts/create-export-ganesha.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extras/ganesha/scripts/create-export-ganesha.sh') diff --git a/extras/ganesha/scripts/create-export-ganesha.sh b/extras/ganesha/scripts/create-export-ganesha.sh index 59750d6dc57..a1a35dba58a 100755 --- a/extras/ganesha/scripts/create-export-ganesha.sh +++ b/extras/ganesha/scripts/create-export-ganesha.sh @@ -87,7 +87,7 @@ echo " }" } write_conf $@ > $GANESHA_DIR/exports/export.$VOL.conf -if ! (cat $CONF | grep $VOL.conf$ ) +if ! (cat $CONF | grep $VOL.conf\"$ ) then echo "%include \"$GANESHA_DIR/exports/export.$VOL.conf\"" >> $CONF fi -- cgit