From mboxrd@z Thu Jan  1 00:00:00 1970
From: Lon Hohberger <lhh@redhat.com>
Date: Tue, 16 Aug 2011 10:59:07 -0400
Subject: [Cluster-devel] [PATCH] cman: allow init script to pass options
 to fenced
In-Reply-To: <1313473853-2929-1-git-send-email-fdinitto@redhat.com>
References: <1313473853-2929-1-git-send-email-fdinitto@redhat.com>
Message-ID: <20110816145906.GD2421@redhat.com>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

On Tue, Aug 16, 2011 at 07:50:53AM +0200, Fabio M. Di Nitto wrote:
> Use FENCED_OPTS to pass startup options to fenced
> 
> Resolves: rhbz#730639
> 
> Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
> ---
>  cman/init.d/cman |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/cman/init.d/cman b/cman/init.d/cman
> index b59216a..2ed83a5 100755
> --- a/cman/init.d/cman
> +++ b/cman/init.d/cman
> @@ -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

This looks fine by me.


-- 
Lon Hohberger - Red Hat, Inc.