proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 11:01:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxcapi_clone: restore the unexpanded config len

Browse Source 
Otherwise it gets shortened with the temporary len but never
restored - which will only break API users which do a clone
then continue to use the original container, meaning this is
a hard one to detect.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Serge Hallyn 2015-11-17 15:05:05 -06:00
parent ab5e52f6a3
commit 3b39251985
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lxc/lxccontainer.c
View File

@ -3059,6 +3059,7 @@ static struct lxc_container *do_lxcapi_clone(struct lxc_container *c, const char
int ret, storage_copied = 0; int ret, storage_copied = 0;
char *origroot = NULL, *saved_unexp_conf = NULL; char *origroot = NULL, *saved_unexp_conf = NULL;
struct clone_update_data data; struct clone_update_data data;
size_t saved_unexp_len;
FILE *fout; FILE *fout;
pid_t pid; pid_t pid;
@ -3106,6 +3107,7 @@ static struct lxc_container *do_lxcapi_clone(struct lxc_container *c, const char
} }
saved_unexp_conf = c->lxc_conf->unexpanded_config; saved_unexp_conf = c->lxc_conf->unexpanded_config;
saved_unexp_len = c->lxc_conf->unexpanded_len;
c->lxc_conf->unexpanded_config = strdup(saved_unexp_conf); c->lxc_conf->unexpanded_config = strdup(saved_unexp_conf);
if (!c->lxc_conf->unexpanded_config) { if (!c->lxc_conf->unexpanded_config) {
ERROR("Out of memory"); ERROR("Out of memory");
@ -3118,6 +3120,7 @@ static struct lxc_container *do_lxcapi_clone(struct lxc_container *c, const char
free(c->lxc_conf->unexpanded_config); free(c->lxc_conf->unexpanded_config);
c->lxc_conf->unexpanded_config = saved_unexp_conf; c->lxc_conf->unexpanded_config = saved_unexp_conf;
saved_unexp_conf = NULL; saved_unexp_conf = NULL;
c->lxc_conf->unexpanded_len = saved_unexp_len;
sprintf(newpath, "%s/%s/rootfs", lxcpath, newname); sprintf(newpath, "%s/%s/rootfs", lxcpath, newname);
if (mkdir(newpath, 0755) < 0) { if (mkdir(newpath, 0755) < 0) {