Skip to content

L
lxc
Commit 476d4cf1 by Daniel Lezcano Committed by Daniel Lezcano
Options

ignore non-lxc configuration line

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. Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent f66331ef
Showing with 8 additions and 4 deletions
src/lxc/confile.c
...@@ -799,7 +799,7 @@ static int parse_line(char *buffer, void *data) ...@@ -799,7 +799,7 @@ static int parse_line(char *buffer, void *data)
char *dot; char *dot;
char *key; char *key;
char *value; char *value;
int ret = -1; int ret = 0;
if (lxc_is_line_empty(buffer)) if (lxc_is_line_empty(buffer))
return 0; return 0;
...@@ -815,10 +815,14 @@ static int parse_line(char *buffer, void *data) ...@@ -815,10 +815,14 @@ static int parse_line(char *buffer, void *data)
} }
line += lxc_char_left_gc(line, strlen(line)); 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; goto out;
}
ret = -1;
dot = strstr(line, "="); dot = strstr(line, "=");
if (!dot) { if (!dot) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment