From: LiFeng <lifeng68@huawei.com>
Date: Mon, 12 Feb 2018 12:22:47 +0000 (-0500)
Subject: Fix lxc-console hang
X-Git-Tag: lxc-3.0.0.beta1~33^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2158%2Fhead;p=thirdparty%2Flxc.git

Fix lxc-console hang

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

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

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);