From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25651 invoked by alias); 27 Mar 2009 19:20:44 -0000 Received: (qmail 25645 invoked by alias); 27 Mar 2009 19:20:44 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 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 bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - cman init: fix cmannotify conditional check To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: eebf76908bfa6d5c05ee5324f0536f3e3716791a X-Git-Newrev: 22a4c3182219454c23ee5573cb781e0f6f7fd22d From: "Fabio M. Di Nitto" Message-Id: <20090327190639.E4F1212020C@lists.fedorahosted.org> Date: Fri, 27 Mar 2009 19:20: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-q1/txt/msg00969.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=22a4c3182219454c23ee5573cb781e0f6f7fd22d Commit: 22a4c3182219454c23ee5573cb781e0f6f7fd22d Parent: eebf76908bfa6d5c05ee5324f0536f3e3716791a Author: Fabio M. Di Nitto AuthorDate: Wed Mar 25 18:57:23 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Fri Mar 27 20:05:46 2009 +0100 cman init: fix cmannotify conditional check Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 53f4de8..0d097d7 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -254,18 +254,13 @@ cmannotifyd_enabled() yes) return 0 ;; - no) - return 1 - ;; conditional) if [ -n "$(ls -1 @NOTIFYDDIR@ 2>/dev/null)" ]; then return 0 fi ;; - *) - return 1 - ;; esac + return 1 } runwrap() @@ -476,7 +471,7 @@ start() runwrap start_daemons "Starting daemons" runwrap start_fence "Starting fencing" runwrap start_fence_xvmd "Starting virtual machine fencing host" - + return 0 }