confile: add clearer for lxc.ephemeral

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
lxc · Jul 16, 2017 · 5eece15 · 5eece15
1 parent 02e5ed4
commit 5eece15
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/lxc/confile.c b/src/lxc/confile.c
@@ -233,6 +233,7 @@ static int clr_config_init_gid(const char *, struct lxc_conf *);
 
 static int set_config_ephemeral(const char *, const char *, struct lxc_conf *);
 static int get_config_ephemeral(const char *, char *, int, struct lxc_conf *);
+static int clr_config_ephemeral(const char *, struct lxc_conf *);
 
 static struct lxc_config_t config[] = {
 	{ "lxc.arch",                 set_config_personality,          get_config_personality,       clr_config_personality,       },
@@ -302,7 +303,7 @@ static struct lxc_config_t config[] = {
 	{ "lxc.init_cmd",             set_config_init_cmd,             get_config_init_cmd,          clr_config_init_cmd,          },
 	{ "lxc.init_uid",             set_config_init_uid,             get_config_init_uid,          clr_config_init_uid,          },
 	{ "lxc.init_gid",             set_config_init_gid,             get_config_init_gid,          clr_config_init_gid,          },
-	{ "lxc.ephemeral",            set_config_ephemeral,            get_config_ephemeral,         NULL },
+	{ "lxc.ephemeral",            set_config_ephemeral,            get_config_ephemeral,         clr_config_ephemeral,         },
 };
 
 struct signame {
@@ -2566,10 +2567,7 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key)
 {
 	int ret = 0;
 
-	if (strcmp(key, "lxc.ephemeral") == 0) {
-		c->ephemeral = 0;
-
-	} else if (strcmp(key, "lxc.include") == 0) {
+	if (strcmp(key, "lxc.include") == 0) {
 		lxc_clear_includes(c);
 
 	} else {
@@ -3896,3 +3894,9 @@ static inline int clr_config_init_gid(const char *key, struct lxc_conf *c)
 	c->init_gid = 0;
 	return 0;
 }
+
+static inline int clr_config_ephemeral(const char *key, struct lxc_conf *c)
+{
+	c->ephemeral = 0;
+	return 0;
+}