commit 16ed615a81294fb32e7d5795db86172d167975ae Author: Andrew Beekhof Date: Mon Nov 11 09:28:18 2013 +1100 Fix: controld: Use the correct variant of dlm_controld for corosync-2 clusters (cherry picked from commit 0e33fe668aa23520da9552b271aba59016b9cb03) diff --git a/extra/resources/controld b/extra/resources/controld index bacf0e9..bdd31bb 100644 --- a/extra/resources/controld +++ b/extra/resources/controld @@ -209,8 +209,8 @@ controld_validate() { : ${OCF_RESKEY_CRM_meta_globally_unique:="false"} case "$HA_quorum_type" in - cman|corosync) daemon_ext="";; - *) daemon_ext=".pcmk";; + pcmk) daemon_ext=".pcmk";; + *) daemon_ext="";; esac case "$OCF_RESOURCE_INSTANCE" in