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: v243-rc1~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d611cfa748aaf600832160132774074e808c82c7;p=thirdparty%2Fsystemd.git

core: never propagate reload failure to service result

Fixes: #11238
---

diff --git a/src/core/service.c b/src/core/service.c
index 65200ff6870..bfbfa4be655 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -3524,7 +3524,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 &&