From 00370edd533c2a6851aa145b7045fc6fcdb621c8 Mon Sep 17 00:00:00 2001 From: David Ward Date: Tue, 23 Jun 2015 10:57:25 -0400 Subject: [PATCH] Fix container creation without a rootfs It is not an error to create a container without a template or rootfs. Signed-off-by: David Ward Acked-by: Serge E. Hallyn --- src/lxc/lxccontainer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index 45b1798ec..ce2ec8aea 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -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;