From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1450 invoked by alias); 28 Apr 2009 18:34:53 -0000 Received: (qmail 1444 invoked by alias); 28 Apr 2009 18:34:53 -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: make groupd check more robust 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: c05898ee8365a6a0046ff7eb2497d4a94ebbab80 X-Git-Newrev: eab924426b6cdd84cb1ac3d2d976d56437c0b3e3 From: "Fabio M. Di Nitto" Message-Id: <20090428183428.EAD701201F1@lists.fedorahosted.org> Date: Tue, 28 Apr 2009 18:34: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/msg00140.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=eab924426b6cdd84cb1ac3d2d976d56437c0b3e3 Commit: eab924426b6cdd84cb1ac3d2d976d56437c0b3e3 Parent: c05898ee8365a6a0046ff7eb2497d4a94ebbab80 Author: Fabio M. Di Nitto AuthorDate: Tue Apr 28 20:33:57 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Tue Apr 28 20:33:57 2009 +0200 cman init: make groupd check more robust avoid stupid errors on startup Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 3ba6c15..38c3fbb 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -321,9 +321,8 @@ groupd_enabled() groupd_compat="$(ccs_tool query /cluster/group/@groupd_compat \ 2>/dev/null || true)" - if [ -z "$groupd_compat" ] || [ $groupd_compat == 0 ]; then - return 1 - fi + [ -z "$groupd_compat" ] && return 1 + [ "$groupd_compat" == 0 ] && return 1 } cmannotifyd_enabled()