summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-27 17:56:12 +0100
committerLennart Poettering <lennart@poettering.net>2015-10-27 17:56:12 +0100
commit76583ef261c65feb6059680f95693ee582406c90 (patch)
tree3a7fc7eefabf0eecd344510a4f4015cf60cd86b0 /src/core
parent0d0696812980d8f41c54739ad73716a233a2fa7c (diff)
core: don't pass uninitialzed PIDs to pid_is_unwaited()
Since 5fd9b2c5467b0a42ccdabc7eb8e516d512609a8e passing a pid of 0 to pid_is_unwaited() and pid_is_live() is considered as a request on the current process, similar how the other calls in process-util.c handle a PID of 0. This broke service.c, which passes a 0 PID and expects it to be considered an unwaited process. This fix make sure we can boot again.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/service.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/service.c b/src/core/service.c
index 31a0d3aebe..a7725c52a0 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -940,7 +940,8 @@ static int service_coldplug(Unit *u) {
return r;
}
- if (pid_is_unwaited(s->main_pid) &&
+ if (s->main_pid > 0 &&
+ pid_is_unwaited(s->main_pid) &&
((s->deserialized_state == SERVICE_START && IN_SET(s->type, SERVICE_FORKING, SERVICE_DBUS, SERVICE_ONESHOT, SERVICE_NOTIFY)) ||
IN_SET(s->deserialized_state,
SERVICE_START, SERVICE_START_POST,
@@ -952,7 +953,8 @@ static int service_coldplug(Unit *u) {
return r;
}
- if (pid_is_unwaited(s->control_pid) &&
+ if (s->control_pid > 0 &&
+ pid_is_unwaited(s->control_pid) &&
IN_SET(s->deserialized_state,
SERVICE_START_PRE, SERVICE_START, SERVICE_START_POST,
SERVICE_RELOAD,