diff options
| author | Meghana M <mmadhusu@redhat.com> | 2015-06-29 06:16:47 +0530 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2015-06-29 09:42:56 -0700 |
| commit | 64f36a04d07fc03aeda2ca7921f874ae0db19fa7 (patch) | |
| tree | de489fc412e7058d26284852cb23ce019fd8a08b | |
| parent | b7b2b14c1f1ea1d232c5a5d5901c00bd187aa841 (diff) | |
NFS-Ganesha : Exporting volume fails
Due to a recent fix, the dbus-send.sh looked
for a .export_added file even before it was
created. This resulted in the ganesha.enable
option failing consistently. Fixing it.
Change-Id: I26a68578551b6e38e49a9997e6f6f983fd668971
BUG: 1236561
Signed-off-by: Meghana M <mmadhusu@redhat.com>
Reviewed-on: http://review.gluster.org/11456
Reviewed-by: soumya k <skoduri@redhat.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rwxr-xr-x | extras/ganesha/scripts/dbus-send.sh | 2 | ||||
| -rwxr-xr-x | extras/hook-scripts/start/post/S31ganesha-start.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extras/ganesha/scripts/dbus-send.sh b/extras/ganesha/scripts/dbus-send.sh index b96bba90e45..d838cabf7b2 100755 --- a/extras/ganesha/scripts/dbus-send.sh +++ b/extras/ganesha/scripts/dbus-send.sh @@ -22,7 +22,7 @@ function check_cmd_status() function dynamic_export_add() { count=`ls -l $GANESHA_DIR/exports/*.conf | wc -l` - if [ "$count" = "0" ] ; + if [ "$count" = "1" ] ; then EXPORT_ID=2 else diff --git a/extras/hook-scripts/start/post/S31ganesha-start.sh b/extras/hook-scripts/start/post/S31ganesha-start.sh index dc3eaeaaa9f..f1ca72b38d2 100755 --- a/extras/hook-scripts/start/post/S31ganesha-start.sh +++ b/extras/hook-scripts/start/post/S31ganesha-start.sh @@ -61,7 +61,7 @@ function write_conf() function export_add() { count=`ls -l $GANESHA_DIR/exports/*.conf | wc -l` - if [ "$count" = "0" ] ; + if [ "$count" = "1" ] ; then EXPORT_ID=2 else |