[Pacemaker] [PATCH] Medium: shell: find hb_delnode in correct directory

[Dejan Muhamedagic]

Applied. Thanks!

Dejan

On Mon, May 10, 2010 at 03:21:18PM +0200, Florian Haas wrote:
> # HG changeset patch
> # User Florian Haas <florian.haas at linbit.com>
> # Date 1273497566 -7200
> # Branch stable-1.0
> # Node ID 70e87f10e76ba6cdada583c0c29ed47168b2878f
> # Parent  423891ec6d91c77582973bed51bc36068a550feb
> Medium: shell: find hb_delnode in correct directory
> 
> Fix "crm node delete" breakage when running on heartbeat:
> hb_delnode is in @datadir@/heartbeat/hb_delnode,
> not @libdir@/heartbeat/hb_delnode.
> 
> diff -r 423891ec6d91 -r 70e87f10e76b shell/modules/ui.py.in
> --- a/shell/modules/ui.py.in	Wed May 05 17:10:32 2010 +0200
> +++ b/shell/modules/ui.py.in	Mon May 10 15:19:26 2010 +0200
> @@ -938,7 +938,7 @@
>      node_standby = "crm_standby -N '%s' -v '%s' %s"
>      node_delete = "cibadmin -D -o nodes -X '<node uname=\"%s\"/>'"
>      node_delete_status = "cibadmin -D -o status -X '<node_state uname=\"%s\"/>'"
> -    hb_delnode = "@libdir@/heartbeat/hb_delnode '%s'"
> +    hb_delnode = "@datadir@/heartbeat/hb_delnode '%s'"
>      crm_node = "crm_node"
>      node_fence = "crm_attribute -t status -U '%s' -n terminate -v true"
>      dc = "crmadmin -D"
> 
> 
> 
> _______________________________________________
> Pacemaker mailing list: Pacemaker at oss.clusterlabs.org
> http://oss.clusterlabs.org/mailman/listinfo/pacemaker
> 
> Project Home: http://www.clusterlabs.org
> Getting started: http://www.clusterlabs.org/doc/Cluster_from_Scratch.pdf