From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabio M. Di Nitto Date: Tue, 15 May 2012 13:55:00 +0200 Subject: [Cluster-devel] [PATCH] cman init: allow sysconfig/cman to pass options to dlm_controld Message-ID: <1337082900-18294-1-git-send-email-fdinitto@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: "Fabio M. Di Nitto" DLM_CONTROLD_OPTS="" can now be used to pass startup options to the daemon. Resolves: rhbz#821016 Signed-off-by: Fabio M. Di Nitto --- 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 a39f19f..dddfe6e 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -116,6 +116,9 @@ fi # empty or any other value (default) | cman init will start the daemons #CMAN_DAEMONS_START= +# 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 @@ -674,7 +677,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 04b3b5b..adde8d9 100644 --- a/cman/init.d/cman.init.defaults.in +++ b/cman/init.d/cman.init.defaults.in @@ -39,6 +39,9 @@ # empty or any other value (default) | cman init will start the daemons #CMAN_DAEMONS_START= +# 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 -- 1.7.7.6