Unverified Commit 2235ad66 by Stéphane Graber Committed by GitHub

Merge pull request #3350 from brauner/2020-04-02/fixes

lxccontainer: poll takes millisecond not seconds
parents 2862e55e 908c75d2
...@@ -2131,7 +2131,7 @@ static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout) ...@@ -2131,7 +2131,7 @@ static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout)
*/ */
if (timeout != 0) { if (timeout != 0) {
ret = poll(&pidfd_poll, 1, timeout); ret = poll(&pidfd_poll, 1, timeout * 1000);
if (ret < 0 || !(pidfd_poll.revents & POLLIN)) if (ret < 0 || !(pidfd_poll.revents & POLLIN))
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment