From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 31 May 2017 06:45:20 +0000 (+0200)
Subject: confile: add getter for lxc.autodev
X-Git-Tag: lxc-2.1.0~110^2~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97f6dad0a397b14ae07078e5ec2dd103b16c8234;p=thirdparty%2Flxc.git

confile: add getter for lxc.autodev

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index edd09815a..2da4f7412 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -166,7 +166,10 @@ static int get_config_seccomp(struct lxc_container *, const char *, char *, int)
 
 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(struct lxc_container *, const char *, char *, int);
+
 static int set_config_haltsignal(const char *, const char *, struct lxc_conf *);
 static int set_config_rebootsignal(const char *, const char *, struct lxc_conf *);
 static int set_config_stopsignal(const char *, const char *, struct lxc_conf *);
@@ -236,8 +239,8 @@ static struct lxc_config_t config[] = {
 	{ "lxc.console.logfile",      set_config_console_logfile,      get_config_console_logfile,   NULL},
 	{ "lxc.console",              set_config_console,              get_config_console,           NULL},
 	{ "lxc.seccomp",              set_config_seccomp,              get_config_seccomp,           NULL},
-	{ "lxc.include",              set_config_includefile,           NULL, NULL},
-	{ "lxc.autodev",              set_config_autodev,               NULL, NULL},
+	{ "lxc.include",              set_config_includefile,          NULL,                         NULL},
+	{ "lxc.autodev",              set_config_autodev,              get_config_autodev,           NULL},
 	{ "lxc.haltsignal",           set_config_haltsignal,            NULL, NULL},
 	{ "lxc.rebootsignal",         set_config_rebootsignal,          NULL, NULL},
 	{ "lxc.stopsignal",           set_config_stopsignal,            NULL, NULL},
@@ -2763,8 +2766,6 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv,
 		return lxc_get_conf_int(c, retv, inlen, c->rebootsignal);
 	else if (strcmp(key, "lxc.stopsignal") == 0)
 		return lxc_get_conf_int(c, retv, inlen, c->stopsignal);
-	else if (strcmp(key, "lxc.autodev") == 0)
-		return lxc_get_conf_int(c, retv, inlen, c->autodev);
 	else return -1;
 
 	if (!v)
@@ -3909,3 +3910,9 @@ static int get_config_seccomp(struct lxc_container *c, const char *key,
 {
 	return lxc_get_conf_str(retv, inlen, c->lxc_conf->seccomp);
 }
+
+static int get_config_autodev(struct lxc_container *c, const char *key,
+			      char *retv, int inlen)
+{
+	return lxc_get_conf_int(c->lxc_conf, retv, inlen, c->lxc_conf->autodev);
+}