cluster: RHEL57 - resource-agents: Trim trailing slash for nfs clients

Lon Hohberger lon at fedoraproject.org
Fri Apr 8 13:47:04 UTC 2011


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=039dd213135bf6bef73cb92292d18cb072a773bc
Commit:        039dd213135bf6bef73cb92292d18cb072a773bc
Parent:        963d04336736b0ad7b4582b100048ea89ba48fad
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Mon Mar 28 16:41:49 2011 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Fri Apr 8 09:31:15 2011 -0400

resource-agents: Trim trailing slash for nfs clients

The exportfs command and/or rpc.mountd trim the trailing slashes
when reporting things in /var/lib/nfs/etab, causing mismatch problems
for the nfsclient resource agent.

Resolves: rhbz#592624

Signed-off-by: Lon Hohberger <lhh at redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 rgmanager/src/resources/nfsclient.sh |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/rgmanager/src/resources/nfsclient.sh b/rgmanager/src/resources/nfsclient.sh
index 2aeee78..138370d 100755
--- a/rgmanager/src/resources/nfsclient.sh
+++ b/rgmanager/src/resources/nfsclient.sh
@@ -266,6 +266,8 @@ verify_path()
 		return $OCF_ERR_ARGS
 	fi
 
+	OCF_RESKEY_path="${OCF_RESKEY_path%/}"
+
 	[ -d "$OCF_RESKEY_path" ] && return 0
 
 	ocf_log err "$OCF_RESKEY_path is not a directory"


More information about the cluster-commits mailing list