[systemd-commits] src/core

[Lennart Poettering]

 src/core/service.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af4713396cff773beb56fef23cd8a9a3803670ab
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 6 09:10:12 2013 +0200

    service: execute ExecStopPost= commands when the watchdog timeout hits
    
    We can assume that a service for which a watchdog timeout was triggered
    is unresponsive to a clean shutdown. However, it still makes sense to
    execute the post-stop cleanup commands that can be configured with
    ExecStopPost=. Hence, when the timeout is hit enter STOP_SIGKILL rather
    than FINAL_SIGKILL.

diff --git a/src/core/service.c b/src/core/service.c
index e110a41..20990d2 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -249,7 +249,7 @@ static void service_handle_watchdog(Service *s) {
         offset = now(CLOCK_MONOTONIC) - s->watchdog_timestamp.monotonic;
         if (offset >= s->watchdog_usec) {
                 log_error_unit(UNIT(s)->id, "%s watchdog timeout!", UNIT(s)->id);
-                service_enter_signal(s, SERVICE_FINAL_SIGKILL, SERVICE_FAILURE_WATCHDOG);
+                service_enter_signal(s, SERVICE_STOP_SIGKILL, SERVICE_FAILURE_WATCHDOG);
                 return;
         }