From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 24 Apr 2010 00:05:42 +0000 (+0200)
Subject: service: don't wait for any child unless we no its pid
X-Git-Tag: 0.git+20100605+dfd8ee-1~56
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e93bc5a61f8589f01e779ab2b5ffc7c7ca072074;p=systemd

service: don't wait for any child unless we no its pid
---

diff --git a/service.c b/service.c
index 40a02c16..83a11e94 100644
--- a/service.c
+++ b/service.c
@@ -1413,7 +1413,7 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) {
                 }
         }
 
-        if (sent) {
+        if (sent && (s->main_pid > 0 || s->control_pid > 0)) {
                 if (s->timeout_usec > 0)
                         if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
                                 goto fail;
diff --git a/socket.c b/socket.c
index 6d15cfe0..755bc598 100644
--- a/socket.c
+++ b/socket.c
@@ -667,7 +667,7 @@ static void socket_enter_signal(Socket *s, SocketState state, bool success) {
                         }
         }
 
-        if (sent) {
+        if (sent && s->control_pid > 0) {
                 if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
                         goto fail;