|
 |
cb8e9e |
From 4cb6e56e64737efdc853b9357023f656f34ef389 Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Meghana M <mmadhusu@redhat.com>
|
|
|
cb8e9e |
Date: Mon, 29 Jun 2015 06:16:47 +0530
|
|
|
cb8e9e |
Subject: [PATCH 192/200] NFS-Ganesha : Exporting volume fails
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Due to a recent fix, the dbus-send.sh looked
|
|
|
cb8e9e |
for a .export_added file even before it was
|
|
|
cb8e9e |
created. This resulted in the ganesha.enable
|
|
|
cb8e9e |
option failing consistently. Fixing it.
|
|
|
cb8e9e |
|
|
|
cb8e9e |
This is the backport of the fix merged upstream,
|
|
|
cb8e9e |
http://review.gluster.org/#/c/11456/
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Change-Id: I2bba25247763b88ab7b964d0f94fcecca98b0c9f
|
|
|
cb8e9e |
BUG: 1236556
|
|
|
cb8e9e |
Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/51927
|
|
|
cb8e9e |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
cb8e9e |
Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
cb8e9e |
Tested-by: Niels de Vos <ndevos@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
extras/ganesha/scripts/dbus-send.sh | 2 +-
|
|
|
cb8e9e |
extras/hook-scripts/start/post/S31ganesha-start.sh | 2 +-
|
|
|
cb8e9e |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/extras/ganesha/scripts/dbus-send.sh b/extras/ganesha/scripts/dbus-send.sh
|
|
|
cb8e9e |
index b96bba9..d838cab 100755
|
|
|
cb8e9e |
--- a/extras/ganesha/scripts/dbus-send.sh
|
|
|
cb8e9e |
+++ b/extras/ganesha/scripts/dbus-send.sh
|
|
|
cb8e9e |
@@ -22,7 +22,7 @@ function check_cmd_status()
|
|
|
cb8e9e |
function dynamic_export_add()
|
|
|
cb8e9e |
{
|
|
|
cb8e9e |
count=`ls -l $GANESHA_DIR/exports/*.conf | wc -l`
|
|
|
cb8e9e |
- if [ "$count" = "0" ] ;
|
|
|
cb8e9e |
+ if [ "$count" = "1" ] ;
|
|
|
cb8e9e |
then
|
|
|
cb8e9e |
EXPORT_ID=2
|
|
|
cb8e9e |
else
|
|
|
cb8e9e |
diff --git a/extras/hook-scripts/start/post/S31ganesha-start.sh b/extras/hook-scripts/start/post/S31ganesha-start.sh
|
|
|
cb8e9e |
index dc3eaea..f1ca72b 100755
|
|
|
cb8e9e |
--- a/extras/hook-scripts/start/post/S31ganesha-start.sh
|
|
|
cb8e9e |
+++ b/extras/hook-scripts/start/post/S31ganesha-start.sh
|
|
|
cb8e9e |
@@ -61,7 +61,7 @@ function write_conf()
|
|
|
cb8e9e |
function export_add()
|
|
|
cb8e9e |
{
|
|
|
cb8e9e |
count=`ls -l $GANESHA_DIR/exports/*.conf | wc -l`
|
|
|
cb8e9e |
- if [ "$count" = "0" ] ;
|
|
|
cb8e9e |
+ if [ "$count" = "1" ] ;
|
|
|
cb8e9e |
then
|
|
|
cb8e9e |
EXPORT_ID=2
|
|
|
cb8e9e |
else
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|