cluster: RHEL4 - rgmanager: fix netfsclient cache handling
Lon Hohberger
lon@fedoraproject.org
Thu Jun 18 17:52:00 GMT 2009
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=175f79e2ad1bac0bdb233eae32f55b8010973813
Commit: 175f79e2ad1bac0bdb233eae32f55b8010973813
Parent: 69249ff719a7f3ee2a6addbdcd2d31fc2a0c1ee1
Author: Juanjo Villaplana <villapla@si.uji.es>
AuthorDate: Thu Feb 26 10:33:34 2009 -0500
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Thu Jun 18 13:51:35 2009 -0400
rgmanager: fix netfsclient cache handling
Ensures correct removal of temporary file when client
caching is disabled.
Resolves: rhbz506152
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 70e69f1..7e8104a 100755
--- a/rgmanager/src/resources/nfsclient.sh
+++ b/rgmanager/src/resources/nfsclient.sh
@@ -413,13 +413,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
@@ -428,7 +428,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
More information about the Cluster-cvs
mailing list