summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2023-04-14 00:25:06 +0100
committerGitHub <noreply@github.com>2023-04-14 00:25:06 +0100
commit2cba2fcd250b0afa543ae4d8869231d16bc28a87 (patch)
treee99713e04a45b2980a4a56ee1d9af2de6ed16be4 /src
parent6ef721cbc7dadee4ae878ecf0076d87e57233908 (diff)
parentaf4688398f55b110c9d7d57be5cd0199b06e18c8 (diff)
downloadsystemd-2cba2fcd250b0afa543ae4d8869231d16bc28a87.tar.gz
Merge pull request #27144 from enr0n/fix-scope-timer-on-coldplug
scope: do not disable timer event source when state is SCOPE_RUNNING
Diffstat (limited to 'src')
-rw-r--r--src/core/scope.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/scope.c b/src/core/scope.c
index 510bb28c93..5f3b62e021 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)) {