lxccontainer: fix non-blocking container stop

Stopping a lxc container with without waiting on it was broken in master. This patch fixes it. Signed-off-by: Robert Vogelgesang <vogel@folz.de>

lxccontainer: fix non-blocking container stop
a94c4a6d · Robert Vogelgesang · Stéphane Graber · 04e0ad4e · a94c4a6d
Unverified Commit a94c4a6d authored Jun 23, 2020 by Robert Vogelgesang Committed by Stéphane Graber Jun 25, 2020
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lxccontainer.c src/lxc/lxccontainer.c +1 -1

No files found.
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2090,6 +2090,7 @@ static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout)

 		if (ret < MAX_STATE)
 			return false;
+	}

 	if (pidfd >= 0) {
 		struct pollfd pidfd_poll = {
@@ -2125,7 +2126,6 @@ static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout)

 		TRACE("Sent signal %d to pid %d", haltsignal, pid);
 	}
-	}

 	if (timeout == 0)
 		return true;