[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-ha-dev
Subject:    Re: [Linux-ha-dev] [PATCH] Use ${OCF_ROOT} instead of
From:       Dejan Muhamedagic <dejanmm () fastmail ! fm>
Date:       2011-02-21 16:50:12
Message-ID: 20110221165011.GD3603 () squib
[Download RAW message or body]

Hi,

On Wed, Feb 16, 2011 at 12:41:53AM +0100, Michael Prokop wrote:
> Hi,
> 
> attached patches address the consequent usage of ${OCF_ROOT} and
> @OCF_ROOT_DIR@ in glue's hb_report/hb_report.in and
> lrm/test/regression.sh.in to avoid hardcoding /usr/lib/ocf/.

Many thanks for the patches.
Both applied.

Cheers,

Dejan

> regards,
> -mika-
> -- 
> http://michael-prokop.at/  || http://adminzen.org/
> http://grml-solutions.com/ || http://grml.org/

> # HG changeset patch
> # User Michael Prokop
> # Date 1297809449 -3600
> # Node ID 371f210a682f36cb373fa4dffbee5f403f6995a5
> # Parent  3e3d209f9217f8e517ed1ab8bb2fdd576cc864be
> Use ${OCF_ROOT} instead of hardcoding /usr/lib/ocf
> 
> diff -r 3e3d209f9217 -r 371f210a682f lrm/test/regression.sh.in
> --- a/lrm/test/regression.sh.in	Mon Jan 31 10:15:04 2011 +0100
> +++ b/lrm/test/regression.sh.in	Tue Feb 15 23:37:29 2011 +0100
> @@ -93,7 +93,7 @@
>  export HA_logfile HA_debugfile HA_use_logd HA_logfacility
>  
>  mkdir -p $OUTDIR
> -. /usr/lib/ocf/resource.d/heartbeat/.ocf-shellfuncs
> +. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
>  
>  args=`getopt hq $*`
>  [ $? -ne 0 ] && usage

> # HG changeset patch
> # User Michael Prokop
> # Date 1297809486 -3600
> # Node ID e51235c51d094122ee3fa6055147bcc8cd301791
> # Parent  371f210a682f36cb373fa4dffbee5f403f6995a5
> Use @OCF_ROOT_DIR@ instead of hardcoding /usr/lib/ocf
> 
> diff -r 371f210a682f -r e51235c51d09 hb_report/hb_report.in
> --- a/hb_report/hb_report.in	Tue Feb 15 23:37:29 2011 +0100
> +++ b/hb_report/hb_report.in	Tue Feb 15 23:38:06 2011 +0100
> @@ -577,7 +577,7 @@
>  sys_info() {
>  	cluster_info
>  	hb_report -V # our info
> -	echo "resource-agents: `grep 'Build version:' /usr/lib/ocf/resource.d/heartbeat/.ocf-shellfuncs`"
> +	echo "resource-agents: `grep 'Build version:' @OCF_ROOT_DIR@/resource.d/heartbeat/.ocf-shellfuncs`"
>  	crm_info
>  	pkg_ver $PACKAGES
>  	echo "Platform: `uname`"




> _______________________________________________________
> Linux-HA-Dev: Linux-HA-Dev@lists.linux-ha.org
> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
> Home Page: http://linux-ha.org/

_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev@lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
[prev in list] [next in list] [prev in thread] [next in thread]