From: LiFeng <lifeng68@huawei.com>
Date: Tue, 15 Jan 2019 12:25:00 +0000 (-0500)
Subject: start: __lxc_start return -1 when start fails
X-Git-Tag: lxc-3.2.0~190^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=575ea46728b10bdb1724b05b517beceb13eff567;p=thirdparty%2Flxc.git

start: __lxc_start return -1 when start fails

Signed-off-by: LiFeng <lifeng68@huawei.com>
---

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 49c2018ca..91f1e51b7 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1940,16 +1940,19 @@ int __lxc_start(const char *name, struct lxc_handler *handler,
 
 	if (!attach_block_device(handler->conf)) {
 		ERROR("Failed to attach block device");
+		ret = -1;
 		goto out_fini_nonet;
 	}
 
 	if (!cgroup_ops->monitor_create(cgroup_ops, handler)) {
 		ERROR("Failed to create monitor cgroup");
+		ret = -1;
 		goto out_fini_nonet;
 	}
 
 	if (!cgroup_ops->monitor_enter(cgroup_ops, handler->monitor_pid)) {
 		ERROR("Failed to enter monitor cgroup");
+		ret = -1;
 		goto out_fini_nonet;
 	}
 
@@ -1994,6 +1997,7 @@ int __lxc_start(const char *name, struct lxc_handler *handler,
 
 	if (!handler->init_died && handler->pid > 0) {
 		ERROR("Child process is not killed");
+		ret = -1;
 		goto out_abort;
 	}