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.
This commit is contained in:
Lennart Poettering
2018-10-26 13:00:04 +02:00
parent 95d0d8ed0a
commit 34b3f625f2
+1 -1
View File
@@ -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;