chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: disable nscd if we can to avoid deadlock, just in case
[elogind.git]
/
src
/
timer.c
diff --git
a/src/timer.c
b/src/timer.c
index 1c7010d120829ddada9accf9c5bb217228e8ec42..0d4ed27bb4f325274cb532db75eb300ab94b983d 100644
(file)
--- a/
src/timer.c
+++ b/
src/timer.c
@@
-268,6
+268,10
@@
static void timer_enter_running(Timer *t) {
assert(t);
dbus_error_init(&error);
assert(t);
dbus_error_init(&error);
+ /* Don't start job if we are supposed to go down */
+ if (t->meta.job && t->meta.job->type == JOB_STOP)
+ return;
+
if ((r = manager_add_job(t->meta.manager, JOB_START, t->unit, JOB_REPLACE, true, &error, NULL)) < 0)
goto fail;
if ((r = manager_add_job(t->meta.manager, JOB_START, t->unit, JOB_REPLACE, true, &error, NULL)) < 0)
goto fail;