[redhat-cluster-pve.git] / debian / patches / fix-cman-init.diff


 * check if cman_tool is installed

Index: new/cman/init.d/cman.in
===================================================================
--- new.orig/cman/init.d/cman.in	2012-10-02 10:58:00.000000000 +0200
+++ new/cman/init.d/cman.in	2012-10-02 11:07:02.000000000 +0200
@@ -22,6 +22,8 @@
 # save invokation for rollback ops
 thisinvokation="$0"
 
+test -x @SBINDIR@/cman_tool || exit 0
+
 chkconfig2()
 {
 	case "$1" in
@@ -146,7 +148,7 @@
 #     DLM_CONTROLD_OPTS="-f0" (at least) for correct operation.
 #     Please note that clusters without fencing are not 
 #     supported by Red Hat except for MRG installations.
-[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
+[ -z "$FENCE_JOIN" ] && FENCE_JOIN="no"
 
 # FENCED_OPTS -- allow extra options to be passed to fence daemon.
 [ -z "$FENCED_OPTS" ] && FENCED_OPTS=""
Commit	Line	Data
3e8a6763 DM	1
	2	* check if cman_tool is installed
	3
3e8a6763 DM	4	Index: new/cman/init.d/cman.in
3e8a6763 DM	5	===================================================================
b3295b8c DM	6	--- new.orig/cman/init.d/cman.in 2012-10-02 10:58:00.000000000 +0200
b3295b8c DM	7	+++ new/cman/init.d/cman.in 2012-10-02 11:07:02.000000000 +0200
f3b46368 DM	8	@@ -22,6 +22,8 @@
	9	# save invokation for rollback ops
	10	thisinvokation="$0"
3e8a6763 DM	11
	12	+test -x @SBINDIR@/cman_tool \|\| exit 0
	13	+
	14	chkconfig2()
	15	{
	16	case "$1" in
b3295b8c DM	17	@@ -146,7 +148,7 @@
	18	# DLM_CONTROLD_OPTS="-f0" (at least) for correct operation.
	19	# Please note that clusters without fencing are not
	20	# supported by Red Hat except for MRG installations.
5aa260b9 DM	21	-[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
	22	+[ -z "$FENCE_JOIN" ] && FENCE_JOIN="no"
	23
	24	# FENCED_OPTS -- allow extra options to be passed to fence daemon.
	25	[ -z "$FENCED_OPTS" ] && FENCED_OPTS=""