s6

commit 6548949226baeaa2b4d4e2ce7a66cbf5ccb33516
parent 807e0eba726802e89206ea6dbad4f06606cb9e5d
Author: Olivier Brunel <jjk@jjacky.com>
Date:   Fri, 27 Jan 2017 20:57:14 +0100

supervise: set down&ready (D) even on LASTFINISH

Signed-off-by: Olivier Brunel <jjk@jjacky.com>

Diffstat:
M
src/supervision/s6-supervise.c
 | 
8
+++++++-

1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/supervision/s6-supervise.c b/src/supervision/s6-supervise.c
@@ -448,6 +448,12 @@ static void finish_X (void)
   finish_x() ;
 }
 
+static void lastfinish_z (void)
+{
+    finish_z() ;
+    bail ();
+}
+
 static action_t_ref const actions[5][25] =
 {
   { &downtimeout, &nop, &bail, &bail, &bail,
@@ -462,7 +468,7 @@ static action_t_ref const actions[5][25] =
   { &uptimeout, &lastup_z, &up_d, &nop, &closethem,
     &killa, &killb, &killq, &killh, &killk, &killt, &killi, &kill1, &kill2, &nop, &nop, &killp, &killc, &killy,
     &up_o, &up_d, &nop, &nop, &up_o, &closethem },
-  { &finishtimeout, &bail, &nop, &nop, &closethem,
+  { &finishtimeout, &lastfinish_z, &nop, &nop, &closethem,
     &nop, &nop, &nop, &nop, &nop, &nop, &nop, &nop, &nop, &nop, &nop, &nop, &nop, &nop,
     &nop, &nop, &nop, &nop, &nop, &closethem }
 } ;