]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Fix lxc-console hang
authorLiFeng <lifeng68@huawei.com>
Mon, 12 Feb 2018 12:22:47 +0000 (07:22 -0500)
committerChristian Brauner <christian.brauner@ubuntu.com>
Mon, 12 Feb 2018 16:22:36 +0000 (17:22 +0100)
The variable 'descr' is mistakenly covered with 'descr_console'.

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

index eee5799eeef8d8fc2aaf4f41e0766e5d1918cd2f..473b8b99b80e303f71a093ffe8a77e62ae78beb3 100644 (file)
@@ -542,6 +542,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);