diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-10-27 18:09:32 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-10-27 18:09:32 +0100 |
| commit | dc1e811ebd80d1659d1476c4ae733d212d6aa946 (patch) | |
| tree | ee28d0fef1577fdc73e723717a83db225406ce8b /src/core/socket.c | |
| parent | 64529a2921a8972878b3f953935f286ce77914e0 (diff) | |
| parent | 930d2838f206d725d890c78475312910cd16329a (diff) | |
Merge pull request #1698 from poettering/pid-is-unwaited-fix
fixup for previous pr
Diffstat (limited to 'src/core/socket.c')
| -rw-r--r-- | src/core/socket.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index f62466c6a0..3c7f972fbc 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1455,7 +1455,9 @@ static int socket_coldplug(Unit *u) { if (s->deserialized_state == s->state) return 0; - if (IN_SET(s->deserialized_state, + if (s->control_pid > 0 && + pid_is_unwaited(s->control_pid) && + IN_SET(s->deserialized_state, SOCKET_START_PRE, SOCKET_START_CHOWN, SOCKET_START_POST, @@ -1466,9 +1468,6 @@ static int socket_coldplug(Unit *u) { SOCKET_FINAL_SIGTERM, SOCKET_FINAL_SIGKILL)) { - if (s->control_pid <= 0) - return -EBADMSG; - r = unit_watch_pid(UNIT(s), s->control_pid); if (r < 0) return r; |