Re: [lxc-devel] [PATCH] log.c: always use dir when lxcpath is not default

2013-04-30 Thread Serge Hallyn
Quoting Dwight Engen (dwight.en...@oracle.com): > Signed-off-by: Dwight Engen Thanks, Dwight. I'll run a test with this and then push it. Acked-by: Serge E. Hallyn > --- > src/lxc/log.c | 36 +++- > 1 file changed, 23 insertions(+), 13 deletions(-) > > diff -

[lxc-devel] [PATCH] log.c: always use dir when lxcpath is not default

2013-04-30 Thread Dwight Engen
Signed-off-by: Dwight Engen --- src/lxc/log.c | 36 +++- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/src/lxc/log.c b/src/lxc/log.c index 61280bc..8d87a51 100644 --- a/src/lxc/log.c +++ b/src/lxc/log.c @@ -187,31 +187,41 @@ static int log_open(co

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

2013-04-30 Thread Serge Hallyn
Gah. Thanks. Quoting S.Çağlar Onur (cag...@10ur.org): > Nope, you missed a backquote :) > > diff --git a/src/lxc/lxc.functions.in b/src/lxc/lxc.functions.in > index 8c25bd5..de268df 100644 > --- a/src/lxc/lxc.functions.in > +++ b/src/lxc/lxc.functions.in > @@ -25,6 +25,6 @@ bindir=@BINDIR@ > te

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

2013-04-30 Thread S . Çağlar Onur
Nope, you missed a backquote :) diff --git a/src/lxc/lxc.functions.in b/src/lxc/lxc.functions.in index 8c25bd5..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-conf

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

2013-04-30 Thread Serge Hallyn
Thanks, guys. I believe staging branch should nwo be correct. -- Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET Get 100% visibility into your production application - at no cost. Code-level diagno

Re: [lxc-devel] [PATCH 2/3] Update .gitignore

2013-04-30 Thread S . Çağlar Onur
On Tue, Apr 30, 2013 at 3:08 PM, Serge Hallyn wrote: > Quoting S.Çağlar Onur (cag...@10ur.org): > > Signed-off-by: S.Çağlar Onur > > --- > > .gitignore | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/.gitignore b/.gitignore > > index c614a75..0cec29a 100644 > > --- a/.gitignore

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

2013-04-30 Thread S . Çağlar Onur
On Tue, Apr 30, 2013 at 3:06 PM, Serge Hallyn wrote: > Quoting S.Çağlar Onur (cag...@10ur.org): > > Signed-off-by: S.Çağlar Onur > > Oh sorry, i didn't update it in enough places did I. > > Per Dwight's comment we want this to be lxcpath, but that means > that lxc.functions.in needs to be updated

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

2013-04-30 Thread 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 --- diff --git a/src/lxc/lxc.functions.in b/sr

Re: [lxc-devel] [PATCH 2/3] Update .gitignore

2013-04-30 Thread Serge Hallyn
Quoting S.Çağlar Onur (cag...@10ur.org): > Signed-off-by: S.Çağlar Onur > --- > .gitignore | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/.gitignore b/.gitignore > index c614a75..0cec29a 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -42,7 +42,9 @@ src/lxc/lxc-cgroup > src/lxc/lx

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

2013-04-30 Thread Serge Hallyn
Quoting S.Çağlar Onur (cag...@10ur.org): > Signed-off-by: S.Çağlar Onur Oh sorry, i didn't update it in enough places did I. Per Dwight's comment we want this to be lxcpath, but that means that lxc.functions.in needs to be updated to call 'lxc-config default_path'. Is there any other place wehre

Re: [lxc-devel] [PATCH 1/3] silence "sh: 1: zfs: not found" errors on systems without ZFS

2013-04-30 Thread Serge Hallyn
Quoting S.Çağlar Onur (cag...@10ur.org): > Signed-off-by: S.Çağlar Onur Acked-by: Serge E. Hallyn thanks. > --- > src/lxc/bdev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c > index a3577a2..1de302f 100644 > --- a/src/lxc/bdev.c > +

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

2013-04-30 Thread S . Çağlar Onur
Signed-off-by: S.Çağlar Onur --- 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 { st

[lxc-devel] [PATCH 1/3] silence "sh: 1: zfs: not found" errors on systems without ZFS

2013-04-30 Thread S . Çağlar Onur
Signed-off-by: S.Çağlar Onur --- src/lxc/bdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c index a3577a2..1de302f 100644 --- a/src/lxc/bdev.c +++ b/src/lxc/bdev.c @@ -440,7 +440,7 @@ static int zfs_list_entry(const char *path, char *output)

[lxc-devel] [PATCH 2/3] Update .gitignore

2013-04-30 Thread S . Çağlar Onur
Signed-off-by: S.Çağlar Onur --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c614a75..0cec29a 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,9 @@ src/lxc/lxc-cgroup src/lxc/lxc-checkconfig src/lxc/lxc-checkpoint src/lxc/lxc-clone +src/l

[lxc-devel] lxcpath/default_path

2013-04-30 Thread S . Çağlar Onur
Hey Serge, It looks like staging requires following as https://github.com/lxc/lxc/commit/a8428dfa2c6a43ee195f4be3e04a519ca1fc6ec0uses default_path but lxc_config provides lxcpath. index a454e07..cf19c7b 100644 --- a/src/lxc/lxc_config.c +++ b/src/lxc/lxc_config.c @@ -9,7 +9,7 @@ struct lxc_config

Re: [lxc-devel] [PATCH v2] Create log file in lxcpath for non-system containers

2013-04-30 Thread Dwight Engen
On Tue, 30 Apr 2013 08:37:44 -0500 Serge Hallyn wrote: > Quoting Dwight Engen (dwight.en...@oracle.com): > > +/* > > + * Build the path to the log file > > + * @name : the name of the container > > + * @lxcpath : the lxcpath to use as a basename or NULL to use > > LOGPATH > > + * Returns mal

Re: [lxc-devel] [PATCH v2] Create log file in lxcpath for non-system containers

2013-04-30 Thread Serge Hallyn
Quoting Dwight Engen (dwight.en...@oracle.com): > +/* > + * Build the path to the log file > + * @name : the name of the container > + * @lxcpath : the lxcpath to use as a basename or NULL to use LOGPATH > + * Returns malloced path on sucess, or NULL on failure > + */ > +static char *build_log