From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 3 Oct 2015 11:37:21 +0000 (+0200)
Subject: core: don't unset reload result, unless we begin a start or reload operation
X-Git-Tag: v227~26^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1452%2Fhead;p=thirdparty%2Fsystemd.git

core: don't unset reload result, unless we begin a start or reload operation

Much like the result of the service itself we should not reset the
reload result unless we actually start from the beginning, so that
clients can query it at any time.

Specifically, let's reset the result states only when we begin with a
start operation (for both the main result, and the reload result), when
we begin with a reload operation (only for the load result), or when the
use explicitly asks for that via "systemctl reset-failed".

This is a more generic fix for #1447.

Fixes #1447.
---

diff --git a/src/core/service.c b/src/core/service.c
index cb0394f9303..3bb0d913b46 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -884,7 +884,6 @@ static void service_set_state(Service *s, ServiceState state) {
                 log_unit_debug(UNIT(s), "Changed %s -> %s", service_state_to_string(old_state), service_state_to_string(state));
 
         unit_notify(UNIT(s), table[old_state], table[state], s->reload_result == SERVICE_SUCCESS);
-        s->reload_result = SERVICE_SUCCESS;
 }
 
 static int service_coldplug(Unit *u) {
@@ -1778,6 +1777,7 @@ static void service_enter_reload(Service *s) {
         assert(s);
 
         service_unwatch_control_pid(s);
+        s->reload_result = SERVICE_SUCCESS;
 
         s->control_command = s->exec_command[SERVICE_EXEC_RELOAD];
         if (s->control_command) {