Only use clear_config_item for lists

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

diff --git a/src/python-lxc/lxc/__init__.py b/src/python-lxc/lxc/__init__.py
index 47b25b8e4a6c81a8e7c7ad63b414599a885d9563..d7b0670dd99e61f0c8cb66e6894704c0a4e6a27b 100644 (file)
--- a/src/python-lxc/lxc/__init__.py
+++ b/src/python-lxc/lxc/__init__.py
@@ -97,8 +97,12 @@ class ContainerNetwork(object):
         return self.__set_network_item(self.props[key], value)
 
     def __clear_network_item(self, key):
-        return self.container.clear_config_item("lxc.network.%s.%s" % (
-                                                self.index, key))
+        if key in ("ipv4", "ipv6"):
+            return self.container.clear_config_item("lxc.network.%s.%s" % (
+                                                    self.index, key))
+        else:
+            return self.container.set_config_item("lxc.network.%s.%s" % (
+                                                    self.index, key), "")
 
     def __get_network_item(self, key):
         return self.container.get_config_item("lxc.network.%s.%s" % (

diff --git a/src/tests/get_item.c b/src/tests/get_item.c
index abf50e8767d59947d03ab1fd1e99c41549b3c66b..943583cdd5866018d910e3f961e4593033b2a2fa 100644 (file)
--- a/src/tests/get_item.c
+++ b/src/tests/get_item.c
@@ -249,7 +249,7 @@ int main(int argc, char *argv[])
                ret = 1;
                goto out;
        }
-       if (!c->clear_config_item(c, "lxc.network.0.ipv4.gateway")) {
+       if (!c->set_config_item(c, "lxc.network.0.ipv4.gateway", "")) {
                fprintf(stderr, "%d: failed clearing ipv4.gateway\n", __LINE__);
                ret = 1;
                goto out;