Merge pull request #2158 from lifeng68/Fix_lxc-console

Fix lxc-console hang
This commit is contained in:
Christian Brauner 2018-02-12 08:41:51 +01:00 committed by GitHub
commit b251b0fe43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -540,6 +540,8 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
ERROR("Failed to add console handlers to console mainloop"); ERROR("Failed to add console handlers to console mainloop");
goto out_mainloop_console; goto out_mainloop_console;
} }
handler->conf->console.descr = &descr;
} }
ret = lxc_cmd_mainloop_add(name, &descr, handler); ret = lxc_cmd_mainloop_add(name, &descr, handler);