summaryrefslogtreecommitdiff
path: root/src/core/execute.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-05-24 02:22:35 +0200
committerLennart Poettering <lennart@poettering.net>2012-05-24 02:22:35 +0200
commite056b01d8acea7fc06d52ef91d227d744faf5259 (patch)
treeac61334a320ed5dfffcea1e08b9d0d8b9f3bac60 /src/core/execute.c
parentd5c446c95abf0cd8edbc55a252514bc7577dc749 (diff)
service: for Type=idle units consider START_PRE, START, START_POST all as ACTIVE
We want to avoid a deadlock when a service has ExecStartPre= programs that wait for the job queue to run empty because of Type=idle, but which themselves keep the queue non-empty because START_PRE was considered ACTIVATING and hence the job not complete. With this patch we alter the state translation table so that it is impossible ever to wait for Type=idle unit, hence removing the deadlock.
Diffstat (limited to 'src/core/execute.c')
-rw-r--r--src/core/execute.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/execute.c b/src/core/execute.c
index 4aed4f6849..bb841b7fcf 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -61,7 +61,7 @@
#include "loopback-setup.h"
#include "path-util.h"
-#define IDLE_TIMEOUT_USEC (1*USEC_PER_SEC)
+#define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
/* This assumes there is a 'tty' group */
#define TTY_MODE 0620