]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Fix lxc-console hang 2158/head
authorLiFeng <lifeng68@huawei.com>
Mon, 12 Feb 2018 12:22:47 +0000 (07:22 -0500)
committerLiFeng <lifeng68@huawei.com>
Mon, 12 Feb 2018 12:26:40 +0000 (07:26 -0500)
The variable 'descr' is mistakenly covered with 'descr_console'.

Signed-off-by: LiFeng <lifeng68@huawei.com>
src/lxc/start.c

index 9508486b8072591ffa99db6fe15640f0ce0aaeca..f9befb827e87d87f0ec493c91cabb5fe533b8f8b 100644 (file)
@@ -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);