From: Mike Yuan Date: Sun, 19 Oct 2025 20:33:03 +0000 (+0200) Subject: core/service: consolidate where to initialize reload_result X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=584e89f26ed52efdfdf930e4ad9aba6adb779214;p=thirdparty%2Fsystemd.git core/service: consolidate where to initialize reload_result --- diff --git a/src/core/service.c b/src/core/service.c index bfd6022e0e9..af2c2b16bd7 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -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;