mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-02 19:59:34 +00:00
Code Issues Releases Wiki Activity

Merge pull request #701 from hallyn/fixunexp

Browse Source 
lxcapi_clone: restore the unexpanded config len
This commit is contained in:
Stéphane Graber
2015-11-17 18:02:10 -05:00
parent ab5e52f6a3 3b39251985
commit 0c233eeec5
1 changed files with 3 additions and 0 deletions
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) {