From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-10643-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 18528 invoked by alias); 27 Mar 2009 19:16:39 -0000
Received: (qmail 18514 invoked by alias); 27 Mar 2009 19:16:38 -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: simplify restart operation
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: 5107d461e84ab84a05e8f0c34bf91b0ef36951b5
X-Git-Newrev: c28af633d98166d3349f3f1163c18bccb514d2b1
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Message-Id: <20090327190651.F371512020C@lists.fedorahosted.org>
Date: Fri, 27 Mar 2009 19:16: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: <cluster-cvs.sourceware.org>
List-Subscribe: <mailto:cluster-cvs-subscribe@sourceware.org>
List-Post: <mailto:cluster-cvs@sourceware.org>
List-Help: <mailto:cluster-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: cluster-cvs-owner@sourceware.org
X-SW-Source: 2009-q1/txt/msg00964.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c28af633d98166d3349f3f1163c18bccb514d2b1
Commit:        c28af633d98166d3349f3f1163c18bccb514d2b1
Parent:        5107d461e84ab84a05e8f0c34bf91b0ef36951b5
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Thu Mar 26 11:54:21 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Mar 27 20:05:46 2009 +0100

cman init: simplify restart operation

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 cman/init.d/cman.in |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index cdb3a24..52709f4 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -737,15 +737,9 @@ stop)
 	stop && rm -f $LOCK_FILE
 ;;
 restart|reload)
-	echo -n "Restarting cluster: "
 	cmanremove=remove
-	if stop > /dev/null 2>&1 && \
-		start > /dev/null 2>&1; then
-			ok
-	else
-		failure
-		rtrn=1
-	fi
+	stop
+	start
 ;;
 status)
 	if cmanstatus; then