Merge pull request #27144 from enr0n/fix-scope-timer-on-coldplug

scope: do not disable timer event source when state is SCOPE_RUNNING
2023-04-14 00:25:06 +01:00
parent 6ef721cbc7 af4688398f
commit 2cba2fcd25
2 changed files with 67 additions and 1 deletions
@@ -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)) {