Skip to content

Commit

Permalink
Fix container creation without a rootfs
Browse files Browse the repository at this point in the history
It is not an error to create a container without a template or rootfs.

Signed-off-by: David Ward <david.ward@ll.mit.edu>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
  • Loading branch information
dpward authored and hallyn committed Aug 27, 2015
1 parent 8ede5f4 commit 00370ed
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/lxc/lxccontainer.c
Expand Up @@ -1365,13 +1365,18 @@ static bool do_lxcapi_create(struct lxc_container *c, const char *t,
goto free_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->rootfs.path && !tpath)
/* no template passed in and rootfs does not exist: error */
if (!c->lxc_conf->rootfs.path && !tpath) {
/* no template passed in and rootfs does not exist */
if (!c->save_config(c, NULL)) {
ERROR("failed to save starting configuration for %s\n", c->name);
goto out;
}
ret = true;
goto out;
}
if (c->lxc_conf->rootfs.path && access(c->lxc_conf->rootfs.path, F_OK) != 0)
/* rootfs passed into configuration, but does not exist: error */
goto out;
Expand Down

0 comments on commit 00370ed

Please sign in to comment.