[redhat-cluster-pve.git] / debian / patches / fix-quorum-wait-time.diff

Index: new/cman/init.d/cman.in
===================================================================
--- new.orig/cman/init.d/cman.in	2011-08-29 10:55:30.000000000 +0200
+++ new/cman/init.d/cman.in	2011-08-29 11:02:49.000000000 +0200
@@ -794,9 +794,17 @@
 		qdiskd_enabled \
 		"Starting qdiskd"
 
-	runwrap wait_for_quorum \
-		none \
-		"Waiting for quorum"
+	if [ "$INITLOGLEVEL" != "quiet" ]; then
+		echo -n "   Waiting for quorum... "
+	fi
+	if wait_for_quorum; then
+		ok
+	else
+	        # we always continue startup
+	        echo -e "$errmsg"
+		echo -ne "[IGNORE]\r"
+	        echo
+	fi
 
 	[ "$breakpoint" = "quorum" ] && exit 0
Commit	Line	Data
c2c6035c DM	1	Index: new/cman/init.d/cman.in
	2	===================================================================
	3	--- new.orig/cman/init.d/cman.in 2011-08-29 10:55:30.000000000 +0200
	4	+++ new/cman/init.d/cman.in 2011-08-29 11:02:49.000000000 +0200
	5	@@ -794,9 +794,17 @@
	6	qdiskd_enabled \
	7	"Starting qdiskd"
	8
	9	- runwrap wait_for_quorum \
	10	- none \
	11	- "Waiting for quorum"
	12	+ if [ "$INITLOGLEVEL" != "quiet" ]; then
	13	+ echo -n " Waiting for quorum... "
	14	+ fi
	15	+ if wait_for_quorum; then
	16	+ ok
	17	+ else
	18	+ # we always continue startup
	19	+ echo -e "$errmsg"
	20	+ echo -ne "[IGNORE]\r"
	21	+ echo
	22	+ fi
	23
	24	[ "$breakpoint" = "quorum" ] && exit 0
	25