Commit 0590e82c by Serge Hallyn

api_create: undo unneeded chunk in previous commit

lxc_conf exists after api_save_config Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent cf465fe4
...@@ -1128,24 +1128,22 @@ static bool lxcapi_create(struct lxc_container *c, const char *t, ...@@ -1128,24 +1128,22 @@ static bool lxcapi_create(struct lxc_container *c, const char *t,
goto out; goto out;
} }
if (c->lxc_conf) { /*
/* * either template or rootfs.path should be set.
* either template or rootfs.path should be set. * if both template and rootfs.path are set, template is setup as rootfs.path.
* 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
* container is already created if we have a config and rootfs.path is accessible */
*/ if (!c->lxc_conf->rootfs.path && !tpath)
if (!c->lxc_conf->rootfs.path && !tpath) /* no template passed in and rootfs does not exist: error */
/* no template passed in and rootfs does not exist: error */ goto out;
goto out; if (c->lxc_conf->rootfs.path && access(c->lxc_conf->rootfs.path, F_OK) != 0)
if (c->lxc_conf->rootfs.path && access(c->lxc_conf->rootfs.path, F_OK) != 0) /* rootfs passed into configuration, but does not exist: error */
/* rootfs passed into configuration, but does not exist: error */ goto out;
goto out; if (lxcapi_is_defined(c) && c->lxc_conf->rootfs.path && !tpath) {
if (lxcapi_is_defined(c) && c->lxc_conf->rootfs.path && !tpath) { /* Rootfs already existed, user just wanted to save the
/* Rootfs already existed, user just wanted to save the * loaded configuration */
* loaded configuration */ ret = true;
ret = true; goto out;
goto out;
}
} }
/* Mark that this container is being created */ /* Mark that this container is being created */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment