From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Fri, 11 Sep 2015 08:42:35 +0000 (+0300)
Subject: core: kill processes started due to the ExecReload= on timeout
X-Git-Tag: v227~142^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1245%2Fhead;p=thirdparty%2Fsystemd.git

core: kill processes started due to the ExecReload= on timeout
---

diff --git a/src/core/service.c b/src/core/service.c
index 248a9e8c623..fc28ba4d079 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2737,6 +2737,8 @@ static int service_dispatch_timer(sd_event_source *source, usec_t usec, void *us
 
         case SERVICE_RELOAD:
                 log_unit_warning(UNIT(s), "Reload operation timed out. Stopping.");
+                service_unwatch_control_pid(s);
+                service_kill_control_processes(s);
                 s->reload_result = SERVICE_FAILURE_TIMEOUT;
                 service_enter_running(s, SERVICE_SUCCESS);
                 break;