daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From 5be84b3ae46c0fd35c3e80d4f457bf5aedc8af8f Mon Sep 17 00:00:00 2001
803fb7
From: Lennart Poettering <lennart@poettering.net>
803fb7
Date: Wed, 23 Sep 2015 17:27:39 +0200
803fb7
Subject: [PATCH] units: increase watchdog timeout to 3min for all our services
803fb7
803fb7
Apparently, disk IO issues are more frequent than we hope, and 1min
803fb7
waiting for disk IO happens, so let's increase the watchdog timeout a
803fb7
bit, for all our services.
803fb7
803fb7
See #1353 for an example where this triggers.
803fb7
803fb7
(cherry picked from commit c2fc2c2560f0ca0fab383753c065e45d76f465e5)
803fb7
Resolves: #1267707
803fb7
---
803fb7
 units/systemd-hostnamed.service.in   | 2 +-
803fb7
 units/systemd-importd.service.in     | 2 +-
803fb7
 units/systemd-journald.service.in    | 2 +-
803fb7
 units/systemd-localed.service.in     | 2 +-
803fb7
 units/systemd-logind.service.in      | 2 +-
803fb7
 units/systemd-machined.service.in    | 2 +-
803fb7
 units/systemd-networkd.service.in    | 2 +-
803fb7
 units/systemd-resolved.service.m4.in | 2 +-
803fb7
 units/systemd-timedated.service.in   | 2 +-
803fb7
 units/systemd-timesyncd.service.in   | 2 +-
803fb7
 10 files changed, 10 insertions(+), 10 deletions(-)
803fb7
803fb7
diff --git a/units/systemd-hostnamed.service.in b/units/systemd-hostnamed.service.in
803fb7
index cc88ecd0d..b7079e4a7 100644
803fb7
--- a/units/systemd-hostnamed.service.in
803fb7
+++ b/units/systemd-hostnamed.service.in
803fb7
@@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/hostnamed
803fb7
 ExecStart=@rootlibexecdir@/systemd-hostnamed
803fb7
 BusName=org.freedesktop.hostname1
803fb7
 CapabilityBoundingSet=CAP_SYS_ADMIN
803fb7
-WatchdogSec=1min
803fb7
+WatchdogSec=3min
803fb7
 PrivateTmp=yes
803fb7
 PrivateDevices=yes
803fb7
 PrivateNetwork=yes
803fb7
diff --git a/units/systemd-importd.service.in b/units/systemd-importd.service.in
803fb7
index 5534a49ed..60e8e9c85 100644
803fb7
--- a/units/systemd-importd.service.in
803fb7
+++ b/units/systemd-importd.service.in
803fb7
@@ -14,7 +14,7 @@ ExecStart=@rootlibexecdir@/systemd-importd
803fb7
 BusName=org.freedesktop.import1
803fb7
 CapabilityBoundingSet=CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD CAP_SETFCAP CAP_SYS_ADMIN CAP_SETPCAP
803fb7
 NoNewPrivileges=yes
803fb7
-WatchdogSec=1min
803fb7
+WatchdogSec=3min
803fb7
 PrivateTmp=yes
803fb7
 ProtectSystem=full
803fb7
 ProtectHome=yes
803fb7
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
803fb7
index 9d4462283..8575912bb 100644
803fb7
--- a/units/systemd-journald.service.in
803fb7
+++ b/units/systemd-journald.service.in
803fb7
@@ -22,7 +22,7 @@ RestartSec=0
803fb7
 NotifyAccess=all
803fb7
 StandardOutput=null
803fb7
 CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_CHOWN CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SETUID CAP_SETGID CAP_MAC_OVERRIDE
803fb7
-WatchdogSec=1min
803fb7
+WatchdogSec=3min
803fb7
 
803fb7
 # Increase the default a bit in order to allow many simultaneous
803fb7
 # services being run since we keep one fd open per service. Also, when
803fb7
diff --git a/units/systemd-localed.service.in b/units/systemd-localed.service.in
803fb7
index bfa097844..9b13f901a 100644
803fb7
--- a/units/systemd-localed.service.in
803fb7
+++ b/units/systemd-localed.service.in
803fb7
@@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/localed
803fb7
 ExecStart=@rootlibexecdir@/systemd-localed
803fb7
 BusName=org.freedesktop.locale1
803fb7
 CapabilityBoundingSet=
803fb7
-WatchdogSec=1min
803fb7
+WatchdogSec=3min
803fb7
 PrivateTmp=yes
803fb7
 PrivateDevices=yes
803fb7
 PrivateNetwork=yes
803fb7
diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in
803fb7
index f087e99ce..ff049134e 100644
803fb7
--- a/units/systemd-logind.service.in
803fb7
+++ b/units/systemd-logind.service.in
803fb7
@@ -24,7 +24,7 @@ Restart=always
803fb7
 RestartSec=0
803fb7
 BusName=org.freedesktop.login1
803fb7
 CapabilityBoundingSet=CAP_SYS_ADMIN CAP_MAC_ADMIN CAP_AUDIT_CONTROL CAP_CHOWN CAP_KILL CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_FOWNER CAP_SYS_TTY_CONFIG
803fb7
-WatchdogSec=1min
803fb7
+WatchdogSec=3min
803fb7
 
803fb7
 # Increase the default a bit in order to allow many simultaneous
803fb7
 # logins since we keep one fd open per session.
803fb7
diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in
803fb7
index 15f34d9db..35cde9869 100644
803fb7
--- a/units/systemd-machined.service.in
803fb7
+++ b/units/systemd-machined.service.in
803fb7
@@ -16,7 +16,7 @@ After=machine.slice
803fb7
 ExecStart=@rootlibexecdir@/systemd-machined
803fb7
 BusName=org.freedesktop.machine1
803fb7
 CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH
803fb7
-WatchdogSec=1min
803fb7
+WatchdogSec=3min
803fb7
 PrivateTmp=yes
803fb7
 PrivateDevices=yes
803fb7
 PrivateNetwork=yes
803fb7
diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
803fb7
index 5a91b8e49..d3808c430 100644
803fb7
--- a/units/systemd-networkd.service.in
803fb7
+++ b/units/systemd-networkd.service.in
803fb7
@@ -25,7 +25,7 @@ ExecStart=@rootlibexecdir@/systemd-networkd
803fb7
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER
803fb7
 ProtectSystem=full
803fb7
 ProtectHome=yes
803fb7
-WatchdogSec=1min
803fb7
+WatchdogSec=3min
803fb7
 
803fb7
 [Install]
803fb7
 WantedBy=multi-user.target
803fb7
diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in
803fb7
index 98ae564af..46864e6a3 100644
803fb7
--- a/units/systemd-resolved.service.m4.in
803fb7
+++ b/units/systemd-resolved.service.m4.in
803fb7
@@ -25,7 +25,7 @@ ExecStart=@rootlibexecdir@/systemd-resolved
803fb7
 CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER
803fb7
 ProtectSystem=full
803fb7
 ProtectHome=yes
803fb7
-WatchdogSec=1min
803fb7
+WatchdogSec=3min
803fb7
 
803fb7
 [Install]
803fb7
 WantedBy=multi-user.target
803fb7
diff --git a/units/systemd-timedated.service.in b/units/systemd-timedated.service.in
803fb7
index fe5ccb460..0c9599db2 100644
803fb7
--- a/units/systemd-timedated.service.in
803fb7
+++ b/units/systemd-timedated.service.in
803fb7
@@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/timedated
803fb7
 ExecStart=@rootlibexecdir@/systemd-timedated
803fb7
 BusName=org.freedesktop.timedate1
803fb7
 CapabilityBoundingSet=CAP_SYS_TIME
803fb7
-WatchdogSec=1min
803fb7
+WatchdogSec=3min
803fb7
 PrivateTmp=yes
803fb7
 ProtectSystem=yes
803fb7
 ProtectHome=yes
803fb7
diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in
803fb7
index 39edafc8d..c7d1d2b4f 100644
803fb7
--- a/units/systemd-timesyncd.service.in
803fb7
+++ b/units/systemd-timesyncd.service.in
803fb7
@@ -27,7 +27,7 @@ PrivateTmp=yes
803fb7
 PrivateDevices=yes
803fb7
 ProtectSystem=full
803fb7
 ProtectHome=yes
803fb7
-WatchdogSec=1min
803fb7
+WatchdogSec=3min
803fb7
 
803fb7
 [Install]
803fb7
 WantedBy=sysinit.target