From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 21 Apr 2015 00:20:15 +0000 (+0200)
Subject: service: timeout on SIGABRT should also be considered an error to remember
X-Git-Tag: v220~385
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ab2ab7b19de7b4e1ef977a6c056ce0b525c198a;p=thirdparty%2Fsystemd.git

service: timeout on SIGABRT should also be considered an error to remember
---

diff --git a/src/core/service.c b/src/core/service.c
index f8370cfc16c..083c2eb4440 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2694,9 +2694,8 @@ static int service_dispatch_timer(sd_event_source *source, usec_t usec, void *us
                 break;
 
         case SERVICE_STOP_SIGABRT:
-                log_unit_warning(UNIT(s)->id,
-                                 "%s stop-sigabrt timed out. Terminating.", UNIT(s)->id);
-                service_enter_signal(s, SERVICE_STOP_SIGTERM, s->result);
+                log_unit_warning(UNIT(s)->id, "%s stop-sigabrt timed out. Terminating.", UNIT(s)->id);
+                service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_TIMEOUT);
                 break;
 
         case SERVICE_STOP_SIGTERM: