From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3324 invoked by alias); 2 Mar 2009 08:35:30 -0000 Received: (qmail 3316 invoked by alias); 2 Mar 2009 08:35:29 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.7 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 - init: make groupd startup conditional 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: a58e8e3218c9588698759123d763377f42a33136 X-Git-Newrev: 3e114a01e96eae78aa58e11f82f371e30215c3e7 From: "Fabio M. Di Nitto" Message-Id: <20090302083510.CE3C0120342@lists.fedorahosted.org> Date: Mon, 02 Mar 2009 08:35: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/msg00653.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3e114a01e96eae78aa58e11f82f371e30215c3e7 Commit: 3e114a01e96eae78aa58e11f82f371e30215c3e7 Parent: a58e8e3218c9588698759123d763377f42a33136 Author: Fabio M. Di Nitto AuthorDate: Mon Mar 2 09:20:52 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Mon Mar 2 09:20:52 2009 +0100 init: make groupd startup conditional if user explicitly request groupd_compat=0, then we don't need to start groupd at all. Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index b8303cb..9d258f3 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -287,7 +287,8 @@ start_qdiskd() start_daemons() { status groupd > /dev/null 2>&1 - if [ $? -ne 0 ]; then + if [ $? -ne 0 ] && \ + [ "$(ccs_tool query /cluster/group/@groupd_compat 2>/dev/null || true)" != "0" ]; then errmsg=$( @SBINDIR@/groupd 2>&1 ) || return 1 fi status fenced > /dev/null 2>&1