Skip to contentSkip to conversation

cman: allow init script to pass options to fenced

PATCH New Fabio M. Di Nitto 2 participants 2 messages Aug 16, 2011

lore
Share & tools
lore

Fabio M. Di Nitto

author
#0 lore raw

PATCH 1/1 cman: allow init script to pass options to fenced

Use FENCED_OPTS to pass startup options to fenced

Resolves: rhbz#730639

Signed-off-by Fabio M. Di Nitto <[email protected]>
---
 cman/init.d/cman |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
cman/init.d/cman +4 -1
index b59216a..2ed83a5 100755
@@ -55,6 +55,9 @@
 #     to join the fence domain (equivalent to "yes").
 [ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
 
+# FENCED_OPTS -- allow extra options to be passed to fence daemon.
+[ -z "$FENCED_OPTS" ] && FENCED_OPTS=""
+
 # NETWORK_BRIDGE_SCRIPT -- script to use for xen network bridging.
 #     This script must exist in the /etc/xen/scripts directory.
 #     The default script is "network-bridge".

@@ -163,7 +166,7 @@ start_daemons()
 
     status fenced &> /dev/null
     if [ $? -ne 0 ]; then
-	errmsg=$( /sbin/fenced 2>&1 ) || return 1
+	errmsg=$( /sbin/fenced "$FENCED_OPTS" 2>&1 ) || return 1
     fi
 
     status dlm_controld &> /dev/null
Signature · 1 line
1.7.4.4
#1 lore raw

PATCH 1/1 cman: allow init script to pass options to fenced

Quoted 24 lines · Fabio M. Di Nitto

Use FENCED_OPTS to pass startup options to fenced

Resolves: rhbz#730639

Signed-off-by Fabio M. Di Nitto <[email protected]>
---
 cman/init.d/cman |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
cman/init.d/cman +3 -0
index b59216a..2ed83a5 100755
@@ -55,6 +55,9 @@
 #     to join the fence domain (equivalent to "yes").
 [ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
 
+# FENCED_OPTS -- allow extra options to be passed to fence daemon.
+[ -z "$FENCED_OPTS" ] && FENCED_OPTS=""
+
 # NETWORK_BRIDGE_SCRIPT -- script to use for xen network bridging.
 #     This script must exist in the /etc/xen/scripts directory.
 #     The default script is "network-bridge".

cman/init.d/cman start_daemons() · line 172

Quoted 8 lines
cman/init.d/cman +1 -1
@@ -163,7 +166,7 @@ start_daemons()
 
     status fenced &> /dev/null
     if [ $? -ne 0 ]; then
-	errmsg=$( /sbin/fenced 2>&1 ) || return 1
+	errmsg=$( /sbin/fenced "$FENCED_OPTS" 2>&1 ) || return 1
     fi
 
     status dlm_controld &> /dev/null

This looks fine by me.

Signature · 1 line
Lon Hohberger - Red Hat, Inc.