From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 2 Apr 2020 16:19:31 +0000 (+0200)
Subject: lxccontainer: poll takes millisecond not seconds
X-Git-Tag: lxc-5.0.0~471^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=908c75d24f7ab4d12a4591e50f2907c20c74a578;p=thirdparty%2Flxc.git

lxccontainer: poll takes millisecond not seconds

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 38439b80b..487d83894 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2131,7 +2131,7 @@ static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout)
 			 */
 
 			if (timeout != 0) {
-				ret = poll(&pidfd_poll, 1, timeout);
+				ret = poll(&pidfd_poll, 1, timeout * 1000);
 				if (ret < 0 || !(pidfd_poll.revents & POLLIN))
 					return false;