[lxc-devel] [PATCH 3/3] Use correct parameter name (default_path instead of lxcpath)

[Dwight Engen]

Hi Çağlar, Serge

This breakage is probably because of a last minute change I asked Serge
about, to keep the arguments to lxc-config the same as the keys in
lxc.conf so the following patch is maybe a better way to fix it:

Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
---

diff --git a/src/lxc/lxc.functions.in b/src/lxc/lxc.functions.in
index ad3d42f..de268df 100644
--- a/src/lxc/lxc.functions.in
+++ b/src/lxc/lxc.functions.in
@@ -25,6 +25,6 @@ bindir=@BINDIR@
 templatedir=@LXCTEMPLATEDIR@
 lxcinitdir=@LXCINITDIR@
 
-lxc_path=`lxc-config default_path`
+lxc_path=`lxc-config lxcpath`
 lxc_vg=`lxc-config lvm_vg`
 lxc_zfsroot=`lxc-config zfsroot`


 
On Tue, 30 Apr 2013 14:55:05 -0400
S.Çağlar Onur <caglar at 10ur.org> wrote:

> Signed-off-by: S.Çağlar Onur <caglar at 10ur.org>
> ---
>  src/lxc/lxc_config.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/lxc/lxc_config.c b/src/lxc/lxc_config.c
> index a454e07..cf19c7b 100644
> --- a/src/lxc/lxc_config.c
> +++ b/src/lxc/lxc_config.c
> @@ -9,7 +9,7 @@ struct lxc_config_items {
>  
>  struct lxc_config_items items[] =
>  {
> -	{ .name = "lxcpath", .fn = &lxc_get_default_config_path, },
> +	{ .name = "default_path", .fn =
> &lxc_get_default_config_path, }, { .name = "lvm_vg", .fn =
> &lxc_get_default_lvm_vg, }, { .name = "zfsroot", .fn =
> &lxc_get_default_zfs_root, }, { .name = NULL, },