From 2ab2ab7b19de7b4e1ef977a6c056ce0b525c198a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 21 Apr 2015 02:20:15 +0200 Subject: service: timeout on SIGABRT should also be considered an error to remember --- src/core/service.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/service.c b/src/core/service.c index f8370cfc16..083c2eb444 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: -- cgit v1.2.3-54-g00ecf