From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32300 invoked by alias); 16 Jun 2009 09:50:18 -0000 Received: (qmail 32290 invoked by alias); 16 Jun 2009 09:50:17 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 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: STABLE3 - cman init: fix groupd 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: d96fe096f1b9e588c92583bd64100dea206a8603 X-Git-Newrev: 45fbdfa2fa826d84d30fee86d6c972d965961645 From: "Fabio M. Di Nitto" Message-Id: <20090616094947.5459912037D@lists.fedorahosted.org> Date: Tue, 16 Jun 2009 09:50: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/msg00531.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=45fbdfa2fa826d84d30fee86d6c972d965961645 Commit: 45fbdfa2fa826d84d30fee86d6c972d965961645 Parent: d96fe096f1b9e588c92583bd64100dea206a8603 Author: Fabio M. Di Nitto AuthorDate: Tue Jun 16 11:48:39 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Tue Jun 16 11:48:39 2009 +0200 cman init: fix groupd check groupd was not started with groupd_compat="1" because of a bad return code in the enable check. Fix the return code, the var check and make groupd stop conditional Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index fb12d3b..b3ceb7d 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -335,7 +335,8 @@ groupd_enabled() 2>/dev/null || true)" [ -z "$groupd_compat" ] && return 1 - [ "$groupd_compat" == 0 ] && return 1 + [ "$groupd_compat" = 0 ] && return 1 + return 0 } cmannotifyd_enabled() @@ -727,7 +728,7 @@ stop() "Stopping fenced" runwrap stop_groupd \ - none \ + groupd_enabled \ "Stopping groupd" runwrap stop_qdiskd \