summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorJiffin Tony Thottan <jthottan@redhat.com>2016-12-06 13:38:21 +0530
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-12-19 02:06:06 -0800
commitef40ff80a642acd3b55046c1674ccaf68dc6d97d (patch)
tree11b24e66ae9b707a368dc2d06f3aeb2c6ee05d21 /extras
parentbcb4712ebf10a3f0b4d0c677b031d812153ecdcd (diff)
ganesha/scripts : find export id for already exported volume in S31ganesha-start.sh
Upstream reference : >Change-Id: Iada90ed215966d3f526fa20aa5359b67f25a6944 >BUG: 1401822 >Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com> >Reviewed-on: http://review.gluster.org/16037 >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> >Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> >(cherry picked from commit 58a58e706da73ee751b7cd98c23e6675667fefdb) Change-Id: Iada90ed215966d3f526fa20aa5359b67f25a6944 BUG: 1403144 Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com> Reviewed-on: http://review.gluster.org/16093 CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'extras')
-rwxr-xr-xextras/hook-scripts/start/post/S31ganesha-start.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/extras/hook-scripts/start/post/S31ganesha-start.sh b/extras/hook-scripts/start/post/S31ganesha-start.sh
index 0e98ec24d19..90ba6bc73a5 100755
--- a/extras/hook-scripts/start/post/S31ganesha-start.sh
+++ b/extras/hook-scripts/start/post/S31ganesha-start.sh
@@ -112,6 +112,9 @@ then
sed -i s/Export_Id.*/"Export_Id=$EXPORT_ID;"/ \
$GANESHA_DIR/exports/export.$VOL.conf
echo "%include \"$GANESHA_DIR/exports/export.$VOL.conf\"" >> $CONF1
+ else
+ EXPORT_ID=$(grep ^[[:space:]]*Export_Id $GANESHA_DIR/exports/export.$VOL.conf |\
+ awk -F"[=,;]" '{print $2}' | tr -d '[[:space:]]')
fi
export_add $VOL
fi