cluster: RHEL61 - cman init: allow sysconfig/cman to pass options to dlm_controld

Fabio M. Di Nitto fabbione at fedoraproject.org
Fri Aug 17 08:36:49 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=11ea03948aa75bbf0ddc37029fc970e96755ef2d
Commit:        11ea03948aa75bbf0ddc37029fc970e96755ef2d
Parent:        63c82dd8e3977c9073e3e74967647b80bf777138
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Tue May 15 13:53:28 2012 +0200
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Fri Aug 17 10:35:18 2012 +0200

cman init: allow sysconfig/cman to pass options to dlm_controld

DLM_CONTROLD_OPTS="" can now be used to pass startup options to the
daemon.

Resolves: rhbz#849047

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie at redhat.com>
---
 cman/init.d/cman.in               |    5 ++++-
 cman/init.d/cman.init.defaults.in |    3 +++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 258df48..cb548c6 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -104,6 +104,9 @@ fi
 # no (default)          | cman will not start sshd
 [ -z "$CMAN_SSHD_START" ] && CMAN_SSHD_START=no
 
+# DLM_CONTROLD_OPTS -- allow extra options to be passed to dlm_controld daemon.
+[ -z "$DLM_CONTROLD_OPTS" ] && DLM_CONTROLD_OPTS=""
+
 # FENCE_JOIN_TIMEOUT -- seconds to wait for fence domain join to
 #     complete.  If the join hasn't completed in this time, fence_tool join
 #     exits with an error, and this script exits with an error.  To wait
@@ -609,7 +612,7 @@ stop_fenced()
 
 start_dlm_controld()
 {
-	start_daemon dlm_controld || return 1
+	start_daemon dlm_controld "$DLM_CONTROLD_OPTS" || return 1
 
 	if [ "$INITLOGLEVEL" = "full" ]; then
 		ok
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index 05c3bc7..d6d010c 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -31,6 +31,9 @@
 # no (default)          | cman will not start sshd
 #CMAN_SSHD_START=no
 
+# DLM_CONTROLD_OPTS -- allow extra options to be passed to dlm_controld daemon.
+#DLM_CONTROLD_OPTS=""
+
 # FENCE_JOIN_TIMEOUT -- seconds to wait for fence domain join to
 #     complete.  If the join hasn't completed in this time, fence_tool join
 #     exits with an error, and this script exits with an error.  To wait


More information about the cluster-commits mailing list