From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16335 invoked by alias); 20 Apr 2009 08:44:20 -0000 Received: (qmail 16321 invoked by alias); 20 Apr 2009 08:44:18 -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 bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - cman init: change groupd startup 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: defd0bc9a1df7b0cfeb2e16a67e89bcb71e2a3ae X-Git-Newrev: 69dd1942d6d443003e6a66be5e9f5cb5bccce0e7 From: "Fabio M. Di Nitto" Message-Id: <20090420084335.46DEB12036C@lists.fedorahosted.org> Date: Mon, 20 Apr 2009 08:44: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/msg00079.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=69dd1942d6d443003e6a66be5e9f5cb5bccce0e7 Commit: 69dd1942d6d443003e6a66be5e9f5cb5bccce0e7 Parent: defd0bc9a1df7b0cfeb2e16a67e89bcb71e2a3ae Author: Fabio M. Di Nitto AuthorDate: Mon Apr 20 10:42:57 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Mon Apr 20 10:42:57 2009 +0200 cman init: change groupd startup check update groupd_enabled check to reflect new defaults. Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 9206a92..49df088 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -304,8 +304,10 @@ qdiskd_enabled() groupd_enabled() { - if [ "$(ccs_tool query /cluster/group/@groupd_compat 2>/dev/null || \ - true)" == "0" ]; then + groupd_compat="$(ccs_tool query /cluster/group/@groupd_compat \ + 2>/dev/null || true)" + + if [ -z "$groupd_compat" ] || [ $groupd_compat == 0 ]; then return 1 fi }