Blob Blame History Raw
commit 2c3992bd6ad2dbcde5a39f8e02059cd99271fabd
Author: David Vossel <dvossel@redhat.com>
Date:   Tue Mar 25 16:34:02 2014 -0500

    Low: controld: Remove '-q 0' from default dlm_controld arguments
    
    The '-q 0' argument allows the dlm to fence nodes even when
    quorum is lost. This is not a desired default.
    
    Resolves: rhbz#1064519
    (cherry picked from commit 20472946f54b0f6f07d286d96e5fb17baaf230ef)

diff --git a/extra/resources/controld b/extra/resources/controld
index 2cc5f4d..a58d4ec 100644
--- a/extra/resources/controld
+++ b/extra/resources/controld
@@ -61,7 +61,7 @@ In most cases, it should be run as an anonymous clone.
 Any additional options to start the dlm_controld service with
 </longdesc>
 <shortdesc lang="en">DLM Options</shortdesc>
-<content type="string" default="-q 0" />
+<content type="string" default="-s 0" />
 </parameter>
 
 <parameter name="configdir" unique="1">
@@ -251,11 +251,11 @@ case "$OCF_RESOURCE_INSTANCE" in
 	: ${OCF_RESKEY_daemon=gfs_controld${daemon_ext}}
 	;;
     *[dD][lL][mM]*)
-	: ${OCF_RESKEY_args=-q 0 -s 0}
+	: ${OCF_RESKEY_args=-s 0}
 	: ${OCF_RESKEY_daemon=dlm_controld${daemon_ext}}
 	;;
     *)
-	: ${OCF_RESKEY_args=-q 0 -s 0}
+	: ${OCF_RESKEY_args=-s 0}
 	: ${OCF_RESKEY_daemon=dlm_controld${daemon_ext}}
 esac