diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2026-04-28 23:19:50 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2026-04-28 23:19:50 +0000 |
| commit | 1ed0fd7938fff466e797a53c9a12000e3ea4b076 (patch) | |
| tree | 613eb4e2c764704915e3b9cc70d10542768b9636 | |
| parent | 73be315d65b09adf52a39ead6a1ee0ccc8bba62c (diff) | |
| download | s6-1ed0fd7938fff466e797a53c9a12000e3ea4b076.tar.gz | |
Send SIGCONT after SIGKILL, workaround for stupid kernels.
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/supervision/s6-supervise.c | 12 |
2 files changed, 11 insertions, 2 deletions
@@ -46,3 +46,4 @@ Thanks to: Saj Goonatilleke <saj@discourse.org> Hoël Bézier <hoelbezier@riseup.net> Josiah Frentsos <jfrent@tilde.team> + Thorsten Glaser <tg@mirbsd.de> diff --git a/src/supervision/s6-supervise.c b/src/supervision/s6-supervise.c index 0547bd0..7b8eea9 100644 --- a/src/supervision/s6-supervise.c +++ b/src/supervision/s6-supervise.c @@ -520,8 +520,16 @@ static void uptimeout (void) { if (gflags.dying) { - if (check_file("flag-timeout-killpg")) killK() ; - else killk() ; + if (check_file("flag-timeout-killpg")) + { + killK() ; + killC() ; + } + else + { + killk() ; + killc() ; + } settimeout(5) ; } else |