From fb720559a8d643e171023f971aa5d87ca5c803dc Mon Sep 17 00:00:00 2001 From: Meghana M Date: Mon, 29 Jun 2015 06:16:47 +0530 Subject: 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. This is a backport of the fix in master, http://review.gluster.org/#/c/11456/ Change-Id: I9658ff8eced405eed7a26fab334f7172171133e8 BUG: 1236933 Signed-off-by: Meghana Reviewed-on: http://review.gluster.org/11458 Tested-by: Gluster Build System Tested-by: NetBSD Build System Reviewed-by: Niels de Vos --- extras/ganesha/scripts/dbus-send.sh | 2 +- extras/hook-scripts/start/post/S31ganesha-start.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'extras') 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 -- cgit