]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
api_create: undo unneeded chunk in previous commit
authorSerge Hallyn <serge.hallyn@ubuntu.com>
Wed, 30 Oct 2013 17:47:38 +0000 (12:47 -0500)
committerSerge Hallyn <serge.hallyn@ubuntu.com>
Wed, 30 Oct 2013 17:49:10 +0000 (12:49 -0500)
lxc_conf exists after api_save_config

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
src/lxc/lxccontainer.c

index 680b536d2760d13c163b548a86c3f94da5294000..1254dc040100768506b7aa0eb0a7802385baa606 100644 (file)
@@ -1128,24 +1128,22 @@ static bool lxcapi_create(struct lxc_container *c, const char *t,
                goto out;
        }
 
-       if (c->lxc_conf) {
-               /*
-                * 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 */
-                       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;
-               if (lxcapi_is_defined(c) && c->lxc_conf->rootfs.path && !tpath) {
-                       /* Rootfs already existed, user just wanted to save the
-                        * loaded configuration */
-                       ret = true;
-                       goto out;
-               }
+       /*
+        * 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 */
+               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;
+       if (lxcapi_is_defined(c) && c->lxc_conf->rootfs.path && !tpath) {
+               /* Rootfs already existed, user just wanted to save the
+                * loaded configuration */
+               ret = true;
+               goto out;
        }
 
        /* Mark that this container is being created */