[lxc-devel] [lxc/master] Fix lxc-console hang

[lifeng68 on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 412 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180212/020546fb/attachment.bin>
-------------- next part --------------
From a54585adf72502a3c9d2f3ee370c92443ed8c7ee Mon Sep 17 00:00:00 2001
From: LiFeng <lifeng68 at huawei.com>
Date: Mon, 12 Feb 2018 07:22:47 -0500
Subject: [PATCH] Fix lxc-console hang

The variable 'descr' is mistakenly covered with 'descr_console'.

Signed-off-by: LiFeng <lifeng68 at huawei.com>
---
 src/lxc/start.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 9508486b8..f9befb827 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -540,6 +540,8 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
 			ERROR("Failed to add console handlers to console mainloop");
 			goto out_mainloop_console;
 		}
+
+		handler->conf->console.descr = &descr;
 	}
 
 	ret = lxc_cmd_mainloop_add(name, &descr, handler);