From 8d032b7ff814b08aba0b23c03cdd589eae98d22a Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 20 Nov 2023 14:57:36 +0000 Subject: Prepare for 2.12.0.2; fix scheduling of rescans/restarts in s6-svscan Signed-off-by: Laurent Bercot --- src/supervision/s6-svscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/supervision/s6-svscan.c') diff --git a/src/supervision/s6-svscan.c b/src/supervision/s6-svscan.c index cbf9e05..9c3a02f 100644 --- a/src/supervision/s6-svscan.c +++ b/src/supervision/s6-svscan.c @@ -748,8 +748,6 @@ int main (int argc, char const *const *argv) int r ; tain deadline = scan_deadline ; tain_earliest1(&deadline, &start_deadline) ; - killthem(&what) ; - reap(&what) ; r = iopause_g(x, 2, &deadline) ; if (r < 0) panic("iopause") ; else if (!r) @@ -767,6 +765,8 @@ int main (int argc, char const *const *argv) if (x[0].revents & IOPAUSE_READ) handle_signals(&what) ; if (x[1].revents & IOPAUSE_READ) handle_control(x[1].fd, &what) ; } + killthem(&what) ; + reap(&what) ; } /* Finish phase. */ -- cgit v1.2.3