From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25546 invoked by alias); 27 Mar 2009 19:20:37 -0000 Received: (qmail 25538 invoked by alias); 27 Mar 2009 19:20:36 -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 return vs exit bug 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: ddffd05beeb88b79a42adf1beee4f15dff155c54 X-Git-Newrev: ba5ec133c6cc16d4f6f4bb4113f261715b7390fc From: "Fabio M. Di Nitto" Message-Id: <20090327190615.E02E412020C@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/msg00968.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ba5ec133c6cc16d4f6f4bb4113f261715b7390fc Commit: ba5ec133c6cc16d4f6f4bb4113f261715b7390fc Parent: ddffd05beeb88b79a42adf1beee4f15dff155c54 Author: Fabio M. Di Nitto AuthorDate: Wed Mar 25 11:06:45 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Fri Mar 27 20:05:45 2009 +0100 cman init: fix return vs exit bug nok should exit and not return. Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index ebb6b64..bf40226 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -146,7 +146,7 @@ ok() { nok() { failure echo - return 1 + exit 1 } load_modules() @@ -219,7 +219,6 @@ unfence_self() ;; 1) nok - return 1 ;; 2) echo -n "unconfigured"