mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
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().
This commit is contained in:
parent
0607a9f9da
commit
e1f85b49b0
@ -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)) {
|
||||
|
Loading…
Reference in New Issue
Block a user