From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 24 Oct 2018 17:03:41 +0000 (+0200)
Subject: service: continue to use the overriden timeout when forking off again
X-Git-Tag: v240~462^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34b3f625f23f1185d673128254540e8c83be4117;p=thirdparty%2Fsystemd.git

service: continue to use the overriden timeout when forking off again

Let's make sure we always use the right watchdog timeout: when a service
has overwritten it, then stick to it, also for follow-up processes of
the same service.
---

diff --git a/src/core/service.c b/src/core/service.c
index cd33e218b64..2e8ef7d1ab5 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1539,7 +1539,7 @@ static int service_spawn(
         exec_params.fd_names = fd_names;
         exec_params.n_socket_fds = n_socket_fds;
         exec_params.n_storage_fds = n_storage_fds;
-        exec_params.watchdog_usec = s->watchdog_usec;
+        exec_params.watchdog_usec = service_get_watchdog_usec(s);
         exec_params.selinux_context_net = s->socket_fd_selinux_context_net;
         if (s->type == SERVICE_IDLE)
                 exec_params.idle_pipe = UNIT(s)->manager->idle_pipe;