From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Thu, 10 Dec 2015 02:12:41 +0000 (+0000)
Subject: fix 'lxc.mount.entry' key when clearing unexpanded config
X-Git-Tag: lxc-2.0.0.beta1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7c6b8c7b731dcb44cd9e1ce17db284ae2a2a0cf;p=thirdparty%2Flxc.git

fix 'lxc.mount.entry' key when clearing unexpanded config

Closes #712

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index ce6786cea..1185d7df6 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2533,7 +2533,7 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key)
 		return lxc_clear_config_keepcaps(c);
 	else if (strncmp(key, "lxc.cgroup", 10) == 0)
 		return lxc_clear_cgroups(c, key);
-	else if (strcmp(key, "lxc.mount.entries") == 0)
+	else if (strcmp(key, "lxc.mount.entry") == 0)
 		return lxc_clear_mount_entries(c);
 	else if (strcmp(key, "lxc.mount.auto") == 0)
 		return lxc_clear_automounts(c);