daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1abbee
From 5be84b3ae46c0fd35c3e80d4f457bf5aedc8af8f Mon Sep 17 00:00:00 2001
1abbee
From: Lennart Poettering <lennart@poettering.net>
1abbee
Date: Wed, 23 Sep 2015 17:27:39 +0200
1abbee
Subject: [PATCH] units: increase watchdog timeout to 3min for all our services
1abbee
1abbee
Apparently, disk IO issues are more frequent than we hope, and 1min
1abbee
waiting for disk IO happens, so let's increase the watchdog timeout a
1abbee
bit, for all our services.
1abbee
1abbee
See #1353 for an example where this triggers.
1abbee
1abbee
(cherry picked from commit c2fc2c2560f0ca0fab383753c065e45d76f465e5)
1abbee
Resolves: #1267707
1abbee
---
1abbee
 units/systemd-hostnamed.service.in   | 2 +-
1abbee
 units/systemd-importd.service.in     | 2 +-
1abbee
 units/systemd-journald.service.in    | 2 +-
1abbee
 units/systemd-localed.service.in     | 2 +-
1abbee
 units/systemd-logind.service.in      | 2 +-
1abbee
 units/systemd-machined.service.in    | 2 +-
1abbee
 units/systemd-networkd.service.in    | 2 +-
1abbee
 units/systemd-resolved.service.m4.in | 2 +-
1abbee
 units/systemd-timedated.service.in   | 2 +-
1abbee
 units/systemd-timesyncd.service.in   | 2 +-
1abbee
 10 files changed, 10 insertions(+), 10 deletions(-)
1abbee
1abbee
diff --git a/units/systemd-hostnamed.service.in b/units/systemd-hostnamed.service.in
1abbee
index cc88ecd..b7079e4 100644
1abbee
--- a/units/systemd-hostnamed.service.in
1abbee
+++ b/units/systemd-hostnamed.service.in
1abbee
@@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/hostnamed
1abbee
 ExecStart=@rootlibexecdir@/systemd-hostnamed
1abbee
 BusName=org.freedesktop.hostname1
1abbee
 CapabilityBoundingSet=CAP_SYS_ADMIN
1abbee
-WatchdogSec=1min
1abbee
+WatchdogSec=3min
1abbee
 PrivateTmp=yes
1abbee
 PrivateDevices=yes
1abbee
 PrivateNetwork=yes
1abbee
diff --git a/units/systemd-importd.service.in b/units/systemd-importd.service.in
1abbee
index 5534a49..60e8e9c 100644
1abbee
--- a/units/systemd-importd.service.in
1abbee
+++ b/units/systemd-importd.service.in
1abbee
@@ -14,7 +14,7 @@ ExecStart=@rootlibexecdir@/systemd-importd
1abbee
 BusName=org.freedesktop.import1
1abbee
 CapabilityBoundingSet=CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD CAP_SETFCAP CAP_SYS_ADMIN CAP_SETPCAP
1abbee
 NoNewPrivileges=yes
1abbee
-WatchdogSec=1min
1abbee
+WatchdogSec=3min
1abbee
 PrivateTmp=yes
1abbee
 ProtectSystem=full
1abbee
 ProtectHome=yes
1abbee
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
1abbee
index 9d44622..8575912 100644
1abbee
--- a/units/systemd-journald.service.in
1abbee
+++ b/units/systemd-journald.service.in
1abbee
@@ -22,7 +22,7 @@ RestartSec=0
1abbee
 NotifyAccess=all
1abbee
 StandardOutput=null
1abbee
 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
1abbee
-WatchdogSec=1min
1abbee
+WatchdogSec=3min
1abbee
 
1abbee
 # Increase the default a bit in order to allow many simultaneous
1abbee
 # services being run since we keep one fd open per service. Also, when
1abbee
diff --git a/units/systemd-localed.service.in b/units/systemd-localed.service.in
1abbee
index bfa0978..9b13f90 100644
1abbee
--- a/units/systemd-localed.service.in
1abbee
+++ b/units/systemd-localed.service.in
1abbee
@@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/localed
1abbee
 ExecStart=@rootlibexecdir@/systemd-localed
1abbee
 BusName=org.freedesktop.locale1
1abbee
 CapabilityBoundingSet=
1abbee
-WatchdogSec=1min
1abbee
+WatchdogSec=3min
1abbee
 PrivateTmp=yes
1abbee
 PrivateDevices=yes
1abbee
 PrivateNetwork=yes
1abbee
diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in
1abbee
index f087e99..ff04913 100644
1abbee
--- a/units/systemd-logind.service.in
1abbee
+++ b/units/systemd-logind.service.in
1abbee
@@ -24,7 +24,7 @@ Restart=always
1abbee
 RestartSec=0
1abbee
 BusName=org.freedesktop.login1
1abbee
 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
1abbee
-WatchdogSec=1min
1abbee
+WatchdogSec=3min
1abbee
 
1abbee
 # Increase the default a bit in order to allow many simultaneous
1abbee
 # logins since we keep one fd open per session.
1abbee
diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in
1abbee
index 15f34d9..35cde98 100644
1abbee
--- a/units/systemd-machined.service.in
1abbee
+++ b/units/systemd-machined.service.in
1abbee
@@ -16,7 +16,7 @@ After=machine.slice
1abbee
 ExecStart=@rootlibexecdir@/systemd-machined
1abbee
 BusName=org.freedesktop.machine1
1abbee
 CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH
1abbee
-WatchdogSec=1min
1abbee
+WatchdogSec=3min
1abbee
 PrivateTmp=yes
1abbee
 PrivateDevices=yes
1abbee
 PrivateNetwork=yes
1abbee
diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
1abbee
index 5a91b8e..d3808c4 100644
1abbee
--- a/units/systemd-networkd.service.in
1abbee
+++ b/units/systemd-networkd.service.in
1abbee
@@ -25,7 +25,7 @@ ExecStart=@rootlibexecdir@/systemd-networkd
1abbee
 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
1abbee
 ProtectSystem=full
1abbee
 ProtectHome=yes
1abbee
-WatchdogSec=1min
1abbee
+WatchdogSec=3min
1abbee
 
1abbee
 [Install]
1abbee
 WantedBy=multi-user.target
1abbee
diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in
1abbee
index 98ae564..46864e6 100644
1abbee
--- a/units/systemd-resolved.service.m4.in
1abbee
+++ b/units/systemd-resolved.service.m4.in
1abbee
@@ -25,7 +25,7 @@ ExecStart=@rootlibexecdir@/systemd-resolved
1abbee
 CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER
1abbee
 ProtectSystem=full
1abbee
 ProtectHome=yes
1abbee
-WatchdogSec=1min
1abbee
+WatchdogSec=3min
1abbee
 
1abbee
 [Install]
1abbee
 WantedBy=multi-user.target
1abbee
diff --git a/units/systemd-timedated.service.in b/units/systemd-timedated.service.in
1abbee
index fe5ccb4..0c9599d 100644
1abbee
--- a/units/systemd-timedated.service.in
1abbee
+++ b/units/systemd-timedated.service.in
1abbee
@@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/timedated
1abbee
 ExecStart=@rootlibexecdir@/systemd-timedated
1abbee
 BusName=org.freedesktop.timedate1
1abbee
 CapabilityBoundingSet=CAP_SYS_TIME
1abbee
-WatchdogSec=1min
1abbee
+WatchdogSec=3min
1abbee
 PrivateTmp=yes
1abbee
 ProtectSystem=yes
1abbee
 ProtectHome=yes
1abbee
diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in
1abbee
index 39edafc..c7d1d2b 100644
1abbee
--- a/units/systemd-timesyncd.service.in
1abbee
+++ b/units/systemd-timesyncd.service.in
1abbee
@@ -27,7 +27,7 @@ PrivateTmp=yes
1abbee
 PrivateDevices=yes
1abbee
 ProtectSystem=full
1abbee
 ProtectHome=yes
1abbee
-WatchdogSec=1min
1abbee
+WatchdogSec=3min
1abbee
 
1abbee
 [Install]
1abbee
 WantedBy=sysinit.target