|
 |
3604df |
From c5bf1758adf3ea2941fd896bc4a38f0c252c6ba1 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
Date: Tue, 6 Dec 2016 13:38:21 +0530
|
|
|
3604df |
Subject: [PATCH 235/235] ganesha/scripts : find export id for already exported
|
|
|
3604df |
volume in S31ganesha-start.sh
|
|
|
3604df |
|
|
|
3604df |
Upstream reference:
|
|
|
3604df |
>Change-Id: Iada90ed215966d3f526fa20aa5359b67f25a6944
|
|
|
3604df |
>BUG: 1401822
|
|
|
3604df |
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
>Reviewed-on: http://review.gluster.org/16037
|
|
|
3604df |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>Reviewed-by: soumya k <skoduri@redhat.com>
|
|
|
3604df |
>Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
Change-Id: Iada90ed215966d3f526fa20aa5359b67f25a6944
|
|
|
3604df |
BUG: 1401806
|
|
|
3604df |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/92556
|
|
|
3604df |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
extras/hook-scripts/start/post/S31ganesha-start.sh | 3 +++
|
|
|
3604df |
1 file changed, 3 insertions(+)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/extras/hook-scripts/start/post/S31ganesha-start.sh b/extras/hook-scripts/start/post/S31ganesha-start.sh
|
|
|
3604df |
index 0e98ec2..90ba6bc 100755
|
|
|
3604df |
--- a/extras/hook-scripts/start/post/S31ganesha-start.sh
|
|
|
3604df |
+++ b/extras/hook-scripts/start/post/S31ganesha-start.sh
|
|
|
3604df |
@@ -112,6 +112,9 @@ then
|
|
|
3604df |
sed -i s/Export_Id.*/"Export_Id=$EXPORT_ID;"/ \
|
|
|
3604df |
$GANESHA_DIR/exports/export.$VOL.conf
|
|
|
3604df |
echo "%include \"$GANESHA_DIR/exports/export.$VOL.conf\"" >> $CONF1
|
|
|
3604df |
+ else
|
|
|
3604df |
+ EXPORT_ID=$(grep ^[[:space:]]*Export_Id $GANESHA_DIR/exports/export.$VOL.conf |\
|
|
|
3604df |
+ awk -F"[=,;]" '{print $2}' | tr -d '[[:space:]]')
|
|
|
3604df |
fi
|
|
|
3604df |
export_add $VOL
|
|
|
3604df |
fi
|
|
|
3604df |
--
|
|
|
3604df |
2.9.3
|
|
|
3604df |
|