From e1f85b49b09ed3e3717cf7776c9da7acc4e906c6 Mon Sep 17 00:00:00 2001 From: Nick Rosbrook Date: Tue, 4 Apr 2023 18:39:26 -0400 Subject: [PATCH] scope: do not disable timer event source when state is SCOPE_RUNNING In scope_set_state(), the timer event source may be disabled depending on the state. Currently, it will be disabled when the state is SCOPE_RUNNING. This has the effect of new RuntimeMaxSec values being ignored on coldplug. Note that this issue is not currently present when scopes are started because when scope_start() is called, scope_arm_timer() is called after scope_set_state(). --- src/core/scope.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/scope.c b/src/core/scope.c index 510bb28c937..5f3b62e0219 100644 --- a/src/core/scope.c +++ b/src/core/scope.c @@ -116,7 +116,7 @@ static void scope_set_state(Scope *s, ScopeState state) { old_state = s->state; s->state = state; - if (!IN_SET(state, SCOPE_STOP_SIGTERM, SCOPE_STOP_SIGKILL, SCOPE_START_CHOWN)) + if (!IN_SET(state, SCOPE_STOP_SIGTERM, SCOPE_STOP_SIGKILL, SCOPE_START_CHOWN, SCOPE_RUNNING)) s->timer_event_source = sd_event_source_disable_unref(s->timer_event_source); if (IN_SET(state, SCOPE_DEAD, SCOPE_FAILED)) { -- 2.47.3