cluster: STABLE3 - cman init: don't wait for quorum twice

["Fabio M. Di Nitto" <fabbione@fedoraproject.org>]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=bec3b293d71404d64976a7da223435e98a969769
Commit:        bec3b293d71404d64976a7da223435e98a969769
Parent:        ce1d15f96aed3e37872d9f8e1d6e70aa0865f7e4
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Tue Aug 18 09:58:05 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Tue Aug 18 09:58:05 2009 +0200

cman init: don't wait for quorum twice

with the newly introduced check for quorum after qdiskd,
there is no point to wait in cman startup anymore since
qdiskd might be the quorum provider.

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

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index ff140fc..e753f7c 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -482,11 +482,6 @@ start_cman()
 	if ! cman_running && cman_checkconfig; then
 		errmsg=$( cman_tool -t $CMAN_CLUSTER_TIMEOUT -w join \
 			$cman_join_opts 2>&1 ) || return 1
-
-		if [ $CMAN_QUORUM_TIMEOUT -gt 0 ]; then
-			errmsg=$( cman_tool -t $CMAN_QUORUM_TIMEOUT \
-				-q wait 2>&1 ) || return 1
-		fi
 	fi
 }