From: Casey Marshall <cmars@cmarstech.com>
Date: Fri, 28 Nov 2014 07:11:06 +0000 (-0600)
Subject: Allow lxc_clear_config_item to clear idmaps.
X-Git-Tag: lxc-1.0.7~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de1230232db796d739fe649d82467a8f346d57e5;p=thirdparty%2Flxc.git

Allow lxc_clear_config_item to clear idmaps.

Ran into this when trying to automate stgraber's "GUI in containers"
post.

Signed-off-by: Casey Marshall <casey.marshall@canonical.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index e3853dc58..da755b862 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2241,6 +2241,9 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key)
 		lxc_seccomp_free(c);
 		return 0;
 	}
+	else if (strncmp(key, "lxc.id_map", 10) == 0) {
+		return lxc_clear_idmaps(c);
+	}
 
 	return -1;
 }