Unverified Commit 231409c3 by Christian Brauner Committed by Stéphane Graber

confile: add getter for lxc.console.logfile

parent 562725ba
...@@ -150,6 +150,8 @@ static int set_config_console(const char *, const char *, struct lxc_conf *); ...@@ -150,6 +150,8 @@ static int set_config_console(const char *, const char *, struct lxc_conf *);
static int get_config_console(struct lxc_container *, const char *, char *, int); static int get_config_console(struct lxc_container *, const char *, char *, int);
static int set_config_console_logfile(const char *, const char *, struct lxc_conf *); static int set_config_console_logfile(const char *, const char *, struct lxc_conf *);
static int get_config_console_logfile(struct lxc_container *, const char *, char *, int);
static int set_config_seccomp(const char *, const char *, struct lxc_conf *); static int set_config_seccomp(const char *, const char *, struct lxc_conf *);
static int set_config_includefile(const char *, const char *, struct lxc_conf *); static int set_config_includefile(const char *, const char *, struct lxc_conf *);
static int set_config_network_nic(const char *, const char *, struct lxc_conf *); static int set_config_network_nic(const char *, const char *, struct lxc_conf *);
...@@ -217,7 +219,7 @@ static struct lxc_config_t config[] = { ...@@ -217,7 +219,7 @@ static struct lxc_config_t config[] = {
{ "lxc.network", set_config_network, get_config_network, NULL}, { "lxc.network", set_config_network, get_config_network, NULL},
{ "lxc.cap.drop", set_config_cap_drop, get_config_cap_drop, NULL}, { "lxc.cap.drop", set_config_cap_drop, get_config_cap_drop, NULL},
{ "lxc.cap.keep", set_config_cap_keep, get_config_cap_keep, NULL}, { "lxc.cap.keep", set_config_cap_keep, get_config_cap_keep, NULL},
{ "lxc.console.logfile", set_config_console_logfile, NULL, NULL}, { "lxc.console.logfile", set_config_console_logfile, get_config_console_logfile, NULL},
{ "lxc.console", set_config_console, get_config_console, NULL}, { "lxc.console", set_config_console, get_config_console, NULL},
{ "lxc.seccomp", set_config_seccomp, NULL, NULL}, { "lxc.seccomp", set_config_seccomp, NULL, NULL},
{ "lxc.include", set_config_includefile, NULL, NULL}, { "lxc.include", set_config_includefile, NULL, NULL},
...@@ -2488,9 +2490,7 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv, ...@@ -2488,9 +2490,7 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv,
{ {
const char *v = NULL; const char *v = NULL;
if (strcmp(key, "lxc.console.logfile") == 0) if (strcmp(key, "lxc.start.auto") == 0)
v = c->console.log_path;
else if (strcmp(key, "lxc.start.auto") == 0)
return lxc_get_conf_int(c, retv, inlen, c->start_auto); return lxc_get_conf_int(c, retv, inlen, c->start_auto);
else if (strcmp(key, "lxc.start.delay") == 0) else if (strcmp(key, "lxc.start.delay") == 0)
return lxc_get_conf_int(c, retv, inlen, c->start_delay); return lxc_get_conf_int(c, retv, inlen, c->start_delay);
...@@ -3595,3 +3595,9 @@ static int get_config_console(struct lxc_container *c, const char *key, ...@@ -3595,3 +3595,9 @@ static int get_config_console(struct lxc_container *c, const char *key,
{ {
return lxc_get_conf_str(retv, inlen, c->lxc_conf->console.path); return lxc_get_conf_str(retv, inlen, c->lxc_conf->console.path);
} }
static int get_config_console_logfile(struct lxc_container *c, const char *key,
char *retv, int inlen)
{
return lxc_get_conf_str(retv, inlen, c->lxc_conf->console.log_path);
}
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