Commit 8d19ce7b by Stéphane Graber

Only use clear_config_item for lists

parent fcdc3e50
......@@ -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" % (
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment