Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > media > main-src > by-pkgid > e536fc0c6270ec1d92a0fd41bb1f8360 > files > 136

rgmanager-2.0.52-28.el5_8.2.src.rpm

From 039dd213135bf6bef73cb92292d18cb072a773bc Mon Sep 17 00:00:00 2001
From: Lon Hohberger <lhh@redhat.com>
Date: Mon, 28 Mar 2011 16:41:49 -0400
Subject: [PATCH] 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@redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto@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"
-- 
1.7.3.4