From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 17 Jul 2019 17:16:33 +0000 (+0200)
Subject: core: never propagate reload failure to service result
X-Git-Tag: archive/raspbian/242-5+rpi1^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e96f92f7af98c32202a86b5bcd69ef5b60deb1eb;p=systemd.git

core: never propagate reload failure to service result

Fixes: #11238
(cherry picked from commit d611cfa748aaf600832160132774074e808c82c7)

Gbp-Pq: Name core-never-propagate-reload-failure-to-service-result.patch
---

diff --git a/src/core/service.c b/src/core/service.c
index 02899901..b6827e94 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -3372,7 +3372,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                                 service_exec_command_to_string(s->control_command_id),
                                 code, status);
 
-                if (s->result == SERVICE_SUCCESS)
+                if (s->state != SERVICE_RELOAD && s->result == SERVICE_SUCCESS)
                         s->result = f;
 
                 if (s->control_command &&