aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--src/supervision/s6-supervise.c12
2 files changed, 11 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index a371083..b6f52c2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -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