cluster: STABLE3 - resource-agents: fix netfsclient cache handling

cluster: STABLE3 - resource-agents: fix netfsclient cache handling

[Lon Hohberger]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=031e839cf89f72f4d782eccb691585a9165b458a
Commit:        031e839cf89f72f4d782eccb691585a9165b458a
Parent:        d1f13ca7f0332249dc11aed843ff93f992fc10e3
Author:        Juanjo Villaplana <villapla@si.uji.es>
AuthorDate:    Thu Feb 26 10:33:34 2009 -0500
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Fri Feb 27 09:41:38 2009 -0500

resource-agents: fix netfsclient cache handling

Ensures correct removal of temporary file when client
caching is disabled.

Resolves: rhbz486329

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/resources/nfsclient.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rgmanager/src/resources/nfsclient.sh b/rgmanager/src/resources/nfsclient.sh
index a526cca..0437d32 100644
--- a/rgmanager/src/resources/nfsclient.sh
+++ b/rgmanager/src/resources/nfsclient.sh
@@ -383,13 +383,13 @@ status|monitor)
 	rv=$? 
 
 	if [ $rv -eq 0 ]; then
-		[ -z "$OCF_RESKEY_service_name" ] && rm -f $tmpfn
+		[ "$OCF_RESKEY_use_cache" = "1" ] || rm -f $tmpfn
 		exit 0
 	fi
 
 	declare OCF_RESKEY_target_tmp=$(clufindhostname -i "$OCF_RESKEY_target")
 	if [ $? -ne 0 ]; then
-		[ -z "$OCF_RESKEY_service_name" ] && rm -f $tmpfn
+		[ "$OCF_RESKEY_use_cache" = "1" ] || rm -f $tmpfn
 		ocf_log err "nfsclient:$OCF_RESKEY_name is missing!"
 		exit 1
 	fi
@@ -398,7 +398,7 @@ status|monitor)
 		"^${OCF_RESKEY_path}[\t ]*.*${OCF_RESKEY_target_tmp}" 
 	rv=$? 
 
-	[ -z "$OCF_RESKEY_service_name" ] && rm -f $tmpfn
+	[ "$OCF_RESKEY_use_cache" = "1" ] || rm -f $tmpfn
 	if [ $rv -eq 0 ]; then
 		exit 0
 	fi