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

lxc-create: fix conflict of rootfs.path and template default path

Browse Source 
1. rootfs.path set, -t not set: rootfs.path is rootfs path
2. rootfs.path set, -t set: change template default path to rootfs path
3. rootfs.path not set, -t set: template default path is rootfs path
4. rootfs.path not set, -t not set: error
5. rootfs.path set but cannot access: error

Signed-off-by: Sheng Yong <shyodx@gmail.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Sheng Yong 2013-10-27 14:38:03 +08:00 committed by Serge Hallyn
parent a69aad27ad
commit cd219ae659
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lxc/lxccontainer.c
View File

@ -701,15 +701,23 @@ static struct bdev *do_bdev_create(struct lxc_container *c, const char *type,
struct bdev_specs *specs) struct bdev_specs *specs)
{ {
char *dest; char *dest;
const char *lxcpath = lxcapi_get_config_path(c); const char *lxcpath;
size_t len; size_t len;
struct bdev *bdev; struct bdev *bdev;
int ret; int ret;
/* lxcpath/lxcname/rootfs */ /* rootfs.path or lxcpath/lxcname/rootfs */
len = strlen(c->name) + strlen(lxcpath) + 9; if (c->lxc_conf->rootfs.path && access(c->lxc_conf->rootfs.path, F_OK) == 0) {
dest = alloca(len); lxcpath = c->lxc_conf->rootfs.path;
ret = snprintf(dest, len, "%s/%s/rootfs", lxcpath, c->name); len = strlen(lxcpath) + 1;
dest = alloca(len);
ret = snprintf(dest, len, "%s", lxcpath);
} else {
lxcpath = lxcapi_get_config_path(c);
len = strlen(c->name) + strlen(lxcpath) + 9;
dest = alloca(len);
ret = snprintf(dest, len, "%s/%s/rootfs", lxcpath, c->name);
}
if (ret < 0 || ret >= len) if (ret < 0 || ret >= len)
return NULL; return NULL;
@ -1107,8 +1115,16 @@ static bool lxcapi_create(struct lxc_container *c, const char *t,
goto out; goto out;
} }
/* container is already created if we have a config and rootfs.path is accessible */ /*
if (lxcapi_is_defined(c) && c->lxc_conf && c->lxc_conf->rootfs.path && access(c->lxc_conf->rootfs.path, F_OK) == 0 && !tpath) { * either template or rootfs.path should be set.
* if both template and rootfs.path are set, template is setup as rootfs.path.
* container is already created if we have a config and rootfs.path is accessible
*/
if (c->lxc_conf && !c->lxc_conf->rootfs.path && !tpath)
goto out;
if (c->lxc_conf->rootfs.path && access(c->lxc_conf->rootfs.path, F_OK) != 0)
goto out;
if (lxcapi_is_defined(c) && c->lxc_conf->rootfs.path && !tpath) {
ret = true; ret = true;
goto out; goto out;
} }