Good for merge

Reviewed-by: Steven Dake <[email protected]>

On 01/28/2011 03:09 AM, Jan Friesse wrote:
> Init script checks kernel parameters and refuses to start corosync if
> nocluster parameter exist on boot time. The init script will
> continue to work as expected from console/tty after boot.
> 
> Signed-off-by: Jan Friesse <[email protected]>
> ---
>  init/generic.in |   13 +++++++++++++
>  1 files changed, 13 insertions(+), 0 deletions(-)
> 
> diff --git a/init/generic.in b/init/generic.in
> index e785b3e..1ce26f0 100755
> --- a/init/generic.in
> +++ b/init/generic.in
> @@ -70,10 +70,23 @@ __pids_pidof() {
>                  pidof -c -o $$ -o $PPID -o %PPID "${1##*/}"
>  }
>  
> +cluster_disabled_at_boot()
> +{
> +       if grep -q nocluster /proc/cmdline && \
> +          [ "$(tty)" = "/dev/console" ]; then
> +               echo -e "not configured to run at boot"
> +               failure
> +               return 1
> +       fi
> +       return 0
> +}
> +
>  start()
>  {
>       echo -n "Starting $desc ($prog): "
>  
> +     ! cluster_disabled_at_boot && return
> +
>       # most recent distributions use tmpfs for @LOCALSTATEDIR@/run
>       # to avoid to clean it up on every boot.
>       # they also assume that init scripts will create

_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais

Reply via email to