]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core/service: consolidate where to initialize reload_result
authorMike Yuan <me@yhndnzj.com>
Sun, 19 Oct 2025 20:33:03 +0000 (22:33 +0200)
committerMike Yuan <me@yhndnzj.com>
Tue, 4 Nov 2025 11:17:32 +0000 (12:17 +0100)
src/core/service.c

index bfd6022e0e9697c0c0237d81f264520961a86df9..af2c2b16bd79c5816276cb6253b1d46139563e28 100644 (file)
@@ -2723,7 +2723,6 @@ static void service_enter_reload_signal_exec(Service *s) {
         assert(s);
 
         service_unwatch_control_pid(s);
-        s->reload_result = SERVICE_SUCCESS;
 
         usec_t ts = now(CLOCK_MONOTONIC);
 
@@ -2816,7 +2815,6 @@ static void service_enter_refresh_extensions(Service *s) {
                 return service_enter_reload_signal_exec(s);
 
         service_unwatch_control_pid(s);
-        s->reload_result = SERVICE_SUCCESS;
         s->control_command = NULL;
         s->control_command_id = _SERVICE_EXEC_COMMAND_INVALID;
 
@@ -3098,6 +3096,8 @@ static int service_reload(Unit *u) {
 
         assert(IN_SET(s->state, SERVICE_RUNNING, SERVICE_EXITED));
 
+        s->reload_result = SERVICE_SUCCESS;
+
         service_enter_refresh_extensions(s);
 
         return 1;