On Mon, Jan 4, 2010 at 5:31 PM, Andrew Beekhof <and...@beekhof.net> wrote:
> Hi,
>
> If you resend as a "hg export" I'll apply it (hg export includes your
> details so you 'll be properly credited).
> Be sure to use a non-inlined attachment, otherwise whitespace tends to
> get mangled.

Thank you very much :)
Attached is the "hg export" of this patch.

Thanks,
Jiaju
# HG changeset patch
# User Jiaju Zhang <jjzhang.li...@gmail.com>
# Date 1262613526 -28800
# Branch stable-1.0
# Node ID 463d55f1f099af36dde4be2ec3b601e4f188d77a
# Parent  d990c453b99963e8610c4bded4b3367f52d9faa0
Small fixes to the controld RA

diff -r d990c453b999 -r 463d55f1f099 extra/resources/controld
--- a/extra/resources/controld	Mon Dec 21 17:10:29 2009 +0100
+++ b/extra/resources/controld	Mon Jan 04 21:58:46 2010 +0800
@@ -54,14 +54,6 @@
 </longdesc>
 <shortdesc lang="en">DLM Options</shortdesc>
 <content type="string" default="-q 0" />
-</parameter>
-
-<parameter name="sctp" unique="1">
-<longdesc lang="en">
-Multi-homed hosts, ones with multiple interfaces, need to use the SCTP protocol instead of TCP.
-</longdesc>
-<shortdesc lang="en">Enable the SCTP protocol</shortdesc>
-<content type="boolean" default="false" />
 </parameter>
 
 <parameter name="configdir" unique="1">
@@ -125,13 +117,6 @@
 	   fi
     	fi
 
-    case $OCF_RESKEY_sctp in
-      true|TRUE|True|yes|YES|Yes|1) 
-	    echo 1 > /sys/kernel/config/dlm/cluster/protocol;;
-      *) 
-	    echo 0 > /sys/kernel/config/dlm/cluster/protocol;;
-    esac
-
     ${OCF_RESKEY_daemon} $OCF_RESKEY_args
 
     sleep 1
@@ -184,6 +169,8 @@
 	    ;;
     esac
 
+    [ -d /var/run/cluster ] || mkdir /var/run/cluster
+
     return $OCF_SUCCESS
 }
 
_______________________________________________
Pacemaker mailing list
Pacemaker@oss.clusterlabs.org
http://oss.clusterlabs.org/mailman/listinfo/pacemaker

Reply via email to