From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24092 invoked by alias); 18 Jun 2009 17:52:21 -0000 Received: (qmail 24086 invoked by alias); 18 Jun 2009 17:52:21 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: RHEL4 - rgmanager: fix netfsclient cache handling To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL4 X-Git-Reftype: branch X-Git-Oldrev: 69249ff719a7f3ee2a6addbdcd2d31fc2a0c1ee1 X-Git-Newrev: 175f79e2ad1bac0bdb233eae32f55b8010973813 From: Lon Hohberger Message-Id: <20090618175156.71CAD120194@lists.fedorahosted.org> Date: Thu, 18 Jun 2009 17:52:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00561.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=175f79e2ad1bac0bdb233eae32f55b8010973813 Commit: 175f79e2ad1bac0bdb233eae32f55b8010973813 Parent: 69249ff719a7f3ee2a6addbdcd2d31fc2a0c1ee1 Author: Juanjo Villaplana AuthorDate: Thu Feb 26 10:33:34 2009 -0500 Committer: Lon Hohberger 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 --- 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