2020-02-14 02:52:10 -05:00
|
|
|
From 374e9e275bd379cfb70df2b252383a50869c42f6 Mon Sep 17 00:00:00 2001
|
2019-09-30 11:03:07 -04:00
|
|
|
From: tanyifeng <tanyifeng1@huawei.com>
|
|
|
|
|
Date: Fri, 15 Mar 2019 10:11:10 +0800
|
2020-02-14 02:52:10 -05:00
|
|
|
Subject: [PATCH 066/139] lxc: Pids limit does not report an error after
|
2019-09-30 11:03:07 -04:00
|
|
|
executing the limit in the background
|
|
|
|
|
|
|
|
|
|
Signed-off-by: wujing <wujing50@huawei.com>
|
|
|
|
|
Signed-off-by: LiFeng <lifeng68@huawei.com>
|
|
|
|
|
---
|
|
|
|
|
src/lxc/tools/lxc_attach.c | 2 ++
|
|
|
|
|
1 file changed, 2 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c
|
2020-01-05 22:20:49 -05:00
|
|
|
index 8856934..acdf8a0 100644
|
2019-09-30 11:03:07 -04:00
|
|
|
--- a/src/lxc/tools/lxc_attach.c
|
|
|
|
|
+++ b/src/lxc/tools/lxc_attach.c
|
|
|
|
|
@@ -378,6 +378,8 @@ static int do_attach_background(struct lxc_container *c, lxc_attach_command_t *c
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
if (c->lxc_conf->errmsg)
|
|
|
|
|
lxc_write_error_message(msgpipe[1], "%s", c->lxc_conf->errmsg);
|
|
|
|
|
+ else
|
|
|
|
|
+ lxc_write_error_message(msgpipe[1], "Failed to attach container");
|
|
|
|
|
close(msgpipe[1]);
|
|
|
|
|
msgpipe[1] = -1;
|
|
|
|
|
ret = -1;
|
|
|
|
|
--
|
2020-01-05 22:20:49 -05:00
|
|
|
1.8.3.1
|
2019-09-30 11:03:07 -04:00
|
|
|
|
