From c721e86c45a766b853e059678c9d68770f8295ea Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 31 May 2017 18:11:08 +0200 Subject: [PATCH] confile: add clearer for lxc.autodev Signed-off-by: Christian Brauner --- src/lxc/confile.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/lxc/confile.c b/src/lxc/confile.c index b56b84dfb..bfb123934 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -166,6 +166,7 @@ static int set_config_network_script_up(const char *, const char *, struct lxc_c static int set_config_network_script_down(const char *, const char *, struct lxc_conf *); static int set_config_network_ipv6(const char *, const char *, struct lxc_conf *); static int set_config_network_ipv6_gateway(const char *, const char *, struct lxc_conf *); +static int set_config_network_nic(const char *, const char *, struct lxc_conf *); static int get_config_network_item(const char *, char *, int, struct lxc_conf *); static int clr_config_network_item(const char *, struct lxc_conf *); @@ -194,10 +195,10 @@ static int get_config_seccomp(const char *, char *, int, struct lxc_conf *); static int clr_config_seccomp(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_autodev(const char *, const char *, struct lxc_conf *); static int get_config_autodev(const char *, char *, int, struct lxc_conf *); +static int clr_config_autodev(const char *, struct lxc_conf *); static int set_config_haltsignal(const char *, const char *, struct lxc_conf *); static int get_config_haltsignal(const char *, char *, int, struct lxc_conf *); @@ -295,8 +296,8 @@ static struct lxc_config_t config[] = { { "lxc.console.logfile", set_config_console_logfile, get_config_console_logfile, clr_config_console_logfile, }, { "lxc.console", set_config_console, get_config_console, clr_config_console, }, { "lxc.seccomp", set_config_seccomp, get_config_seccomp, clr_config_seccomp, }, - { "lxc.include", set_config_includefile, NULL, NULL }, - { "lxc.autodev", set_config_autodev, get_config_autodev, NULL }, + { "lxc.include", set_config_includefile, NULL, NULL }, + { "lxc.autodev", set_config_autodev, get_config_autodev, clr_config_autodev, }, { "lxc.haltsignal", set_config_haltsignal, get_config_haltsignal, NULL }, { "lxc.rebootsignal", set_config_rebootsignal, get_config_rebootsignal, NULL }, { "lxc.stopsignal", set_config_stopsignal, get_config_stopsignal, NULL }, @@ -2790,9 +2791,6 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key) } else if (strcmp(key, "lxc.ephemeral") == 0) { c->ephemeral = 0; - } else if (strcmp(key, "lxc.autodev") == 0) { - c->autodev = 1; - } else if (strcmp(key, "lxc.monitor.unshare") == 0) { c->monitor_unshare = 0; @@ -4191,3 +4189,9 @@ static inline int clr_config_seccomp(const char *key, struct lxc_conf *c) c->seccomp = NULL; return 0; } + +static inline int clr_config_autodev(const char *key, struct lxc_conf *c) +{ + c->autodev = 1; + return 0; +}