diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-04-26 02:57:41 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-04-26 03:01:49 +0200 |
| commit | 31afa0a44c2d7f93d837c840cdbd623982ac165f (patch) | |
| tree | 054b8f0aa7aabfe01f02db08286793eeef8b7159 /src/core/timer.c | |
| parent | always unconditionally create /dev/rtc and use it internally (diff) | |
| download | systemd-31afa0a44c2d7f93d837c840cdbd623982ac165f.tar.xz systemd-31afa0a44c2d7f93d837c840cdbd623982ac165f.zip | |
unit: rework stop pending logic
When a trigger unit wants to know if a stop is queued for it, we should
just check precisely that and do not check whether it is actually
stopped already. This is because we use these checks usually from state
change calls where the state variables are not updated yet.
This change splits unit_pending_inactive() into two calls
unit_inactive_or_pending() and unit_stop_pending(). The former checks
state and pending jobs, the latter only pending jobs.
Diffstat (limited to 'src/core/timer.c')
| -rw-r--r-- | src/core/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/timer.c b/src/core/timer.c index b8039d82ec..ff8c30583c 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -374,7 +374,7 @@ static void timer_enter_running(Timer *t) { dbus_error_init(&error); /* Don't start job if we are supposed to go down */ - if (unit_pending_inactive(UNIT(t))) + if (unit_stop_pending(UNIT(t))) return; r = manager_add_job(UNIT(t)->manager, JOB_START, UNIT_TRIGGER(UNIT(t)), |