proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2026-03-28 10:18:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clear_config_item should only work for lists

Browse Source 
Close #394

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Stéphane Graber 2015-01-26 15:52:11 -05:00
parent b340eab858
commit fcdc3e50ea
2 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lxc/conf.c
View File

@ -3953,27 +3953,6 @@ int lxc_clear_nic(struct lxc_conf *c, const char *key)
free(it2->elem);
free(it2);
}
} else if (strcmp(p1, ".link") == 0) {
free(netdev->link);
netdev->link = NULL;
} else if (strcmp(p1, ".name") == 0) {
free(netdev->name);
netdev->name = NULL;
} else if (strcmp(p1, ".script.up") == 0) {
free(netdev->upscript);
netdev->upscript = NULL;
} else if (strcmp(p1, ".hwaddr") == 0) {
free(netdev->hwaddr);
netdev->hwaddr = NULL;
} else if (strcmp(p1, ".mtu") == 0) {
free(netdev->mtu);
netdev->mtu = NULL;
} else if (strcmp(p1, ".ipv4.gateway") == 0) {
free(netdev->ipv4_gateway);
netdev->ipv4_gateway = NULL;
} else if (strcmp(p1, ".ipv6.gateway") == 0) {
free(netdev->ipv6_gateway);
netdev->ipv6_gateway = NULL;
}
else return -1;

10
src/lxc/confile.c
View File

@ -2442,16 +2442,10 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key)
return lxc_clear_hooks(c, key);
else if (strncmp(key, "lxc.group", 9) == 0)
return lxc_clear_groups(c);
else if (strncmp(key, "lxc.seccomp", 11) == 0) {
lxc_seccomp_free(c);
return 0;
}
else if (strncmp(key, "lxc.environment", 15) == 0) {
else if (strncmp(key, "lxc.environment", 15) == 0)
return lxc_clear_environment(c);
}
else if (strncmp(key, "lxc.id_map", 10) == 0) {
else if (strncmp(key, "lxc.id_map", 10) == 0)
return lxc_clear_idmaps(c);
}
return -1;
}