diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2023-11-20 14:57:36 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2023-11-20 14:57:36 +0000 |
| commit | 8d032b7ff814b08aba0b23c03cdd589eae98d22a (patch) | |
| tree | 468d2fa922978ba08b04bdd7a171399098c68113 | |
| parent | fc0a5ac48bd417336f6d3333ac7846d8134579eb (diff) | |
| download | s6-8d032b7ff814b08aba0b23c03cdd589eae98d22a.tar.xz | |
Prepare for 2.12.0.2; fix scheduling of rescans/restarts in s6-svscan
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | doc/upgrade.html | 6 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/supervision/s6-svscan.c | 4 |
5 files changed, 16 insertions, 4 deletions
@@ -1,5 +1,11 @@ Changelog for s6. +In 2.12.0.2 +----------- + + - Bugfixes. + + In 2.12.0.1 ----------- diff --git a/doc/index.html b/doc/index.html index 7a110ba..cbec2d5 100644 --- a/doc/index.html +++ b/doc/index.html @@ -115,7 +115,7 @@ want nsswitch-like functionality: <h3> Download </h3> <ul> - <li> The current released version of s6 is <a href="s6-2.12.0.1.tar.gz">2.12.0.1</a>. </li> + <li> The current released version of s6 is <a href="s6-2.12.0.2.tar.gz">2.12.0.2</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6 git repository</a>: diff --git a/doc/upgrade.html b/doc/upgrade.html index a038a4d..e147cc7 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,12 @@ <h1> What has changed in s6 </h1> +<h2> in 2.12.0.2 </h2> + +<ul> + <li> No functional changes. </li> +</ul> + <h2> in 2.12.0.1 </h2> <ul> diff --git a/package/info b/package/info index e1e1753..b11e016 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6 -version=2.12.0.1 +version=2.12.0.2 category=admin package_macro_name=S6 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. */ |