On Fri, 2011-05-13 at 22:32 +0200, Daniel Lezcano wrote: > From: Daniel Lezcano <daniel.lezc...@free.fr>
> We ignore the line of in the configuration file not beginning by "lxc."
> So we can mix the configuration file with another information used for
> another component through the lxc library.
Wow...
I seem to recall requesting this sort of thing ages ago. Maybe even
before we created the -users list and only had the -dev list and was
shot down. I have soooo wanted this feature. That can implement many
of the OpenVZ compatibility things we need the high level scripts to
perform and keep them in one file. Many thanks. I as SO glad to see
this!
Regards,
Mike
> Signed-off-by: Daniel Lezcano <dlezc...@fr.ibm.com>
> ---
> src/lxc/confile.c | 12 ++++++++----
> 1 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/src/lxc/confile.c b/src/lxc/confile.c
> index 791f04f..d632404 100644
> --- a/src/lxc/confile.c
> +++ b/src/lxc/confile.c
> @@ -799,7 +799,7 @@ static int parse_line(char *buffer, void *data)
> char *dot;
> char *key;
> char *value;
> - int ret = -1;
> + int ret = 0;
>
> if (lxc_is_line_empty(buffer))
> return 0;
> @@ -815,10 +815,14 @@ static int parse_line(char *buffer, void *data)
> }
>
> line += lxc_char_left_gc(line, strlen(line));
> - if (line[0] == '#') {
> - ret = 0;
> +
> + /* martian option - ignoring it, the commented lines beginning by '#'
> + * fall in this case
> + */
> + if (strncmp(line, "lxc.", 4))
> goto out;
> - }
> +
> + ret = -1;
>
> dot = strstr(line, "=");
> if (!dot) {
--
Michael H. Warfield (AI4NB) | (770) 985-6132 | m...@wittsend.com
/\/\|=mhw=|\/\/ | (678) 463-0932 | http://www.wittsend.com/mhw/
NIC whois: MHW9 | An optimist believes we live in the best of all
PGP Key: 0x674627FF | possible worlds. A pessimist is sure of it!
signature.asc
Description: This is a digitally signed message part
------------------------------------------------------------------------------ Simplify data backup and recovery for your virtual environment with vRanger. Installation's a snap, and flexible recovery options mean your data is safe, secure and there when you need it. Data protection magic? Nope - It's vRanger. Get your free trial download today. http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________ Lxc-users mailing list Lxc-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-users
