[gnome-settings-daemon/benzea/systemd-lower-timeout: 3/5] plugins: Lower systemd stop timeout

[Carlos Garnacho <carlosg src gnome org>]

commit b4ccfcfcebb6dd59598559968628139d3096e61e
Author: Benjamin Berg <bberg redhat com>
Date:   Tue Dec 10 14:58:06 2019 +0100

    plugins: Lower systemd stop timeout
    
    This prevents logout to hang if one of the g-s-d processes refuses to
    quit. That should never happen, but it does not hurt to configure
    systemd to kill the process already after 5 seconds rather than waiting
    up to 1 minute 30 seconds.

 plugins/a11y-settings/gsd-a11y-settings.service.in             | 1 +
 plugins/color/gsd-color.service.in                             | 2 +-
 plugins/datetime/gsd-datetime.service.in                       | 1 +
 plugins/dummy/gsd-dummy.service.in                             | 1 +
 plugins/housekeeping/gsd-housekeeping.service.in               | 1 +
 plugins/keyboard/gsd-keyboard.service.in                       | 1 +
 plugins/media-keys/gsd-media-keys.service.in                   | 1 +
 plugins/power/gsd-power.service.in                             | 1 +
 plugins/print-notifications/gsd-print-notifications.service.in | 1 +
 plugins/rfkill/gsd-rfkill.service.in                           | 1 +
 plugins/screensaver-proxy/gsd-screensaver-proxy.service.in     | 1 +
 plugins/sharing/gsd-sharing.service.in                         | 1 +
 plugins/smartcard/gsd-smartcard.service.in                     | 1 +
 plugins/sound/gsd-sound.service.in                             | 1 +
 plugins/wacom/gsd-wacom.service.in                             | 1 +
 plugins/wwan/gsd-wwan.service.in                               | 1 +
 plugins/xsettings/gsd-xsettings.service.in                     | 1 +
 17 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/plugins/a11y-settings/gsd-a11y-settings.service.in 
b/plugins/a11y-settings/gsd-a11y-settings.service.in
index d5fa3792..d6cf52b1 100644
--- a/plugins/a11y-settings/gsd-a11y-settings.service.in
+++ b/plugins/a11y-settings/gsd-a11y-settings.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-a11y-settings
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/color/gsd-color.service.in b/plugins/color/gsd-color.service.in
index b51b5e4e..e7cb8cda 100644
--- a/plugins/color/gsd-color.service.in
+++ b/plugins/color/gsd-color.service.in
@@ -16,4 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-color
 Restart=on-failure
 BusName=@plugin_dbus_name@
-
+TimeoutStopSec=5
diff --git a/plugins/datetime/gsd-datetime.service.in b/plugins/datetime/gsd-datetime.service.in
index 980a6c91..bd4692b8 100644
--- a/plugins/datetime/gsd-datetime.service.in
+++ b/plugins/datetime/gsd-datetime.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-datetime
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/dummy/gsd-dummy.service.in b/plugins/dummy/gsd-dummy.service.in
index 554df09c..affa6620 100644
--- a/plugins/dummy/gsd-dummy.service.in
+++ b/plugins/dummy/gsd-dummy.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-dummy --dummy-name=@pluginname@
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/housekeeping/gsd-housekeeping.service.in 
b/plugins/housekeeping/gsd-housekeeping.service.in
index 176e24d2..8ce838ac 100644
--- a/plugins/housekeeping/gsd-housekeeping.service.in
+++ b/plugins/housekeeping/gsd-housekeeping.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-housekeeping
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/keyboard/gsd-keyboard.service.in b/plugins/keyboard/gsd-keyboard.service.in
index 095468ee..4986682d 100644
--- a/plugins/keyboard/gsd-keyboard.service.in
+++ b/plugins/keyboard/gsd-keyboard.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-keyboard
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/media-keys/gsd-media-keys.service.in b/plugins/media-keys/gsd-media-keys.service.in
index 0b715b6b..4646836b 100644
--- a/plugins/media-keys/gsd-media-keys.service.in
+++ b/plugins/media-keys/gsd-media-keys.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-media-keys
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/power/gsd-power.service.in b/plugins/power/gsd-power.service.in
index c1c57add..62f18621 100644
--- a/plugins/power/gsd-power.service.in
+++ b/plugins/power/gsd-power.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-power
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/print-notifications/gsd-print-notifications.service.in 
b/plugins/print-notifications/gsd-print-notifications.service.in
index 6504c69b..ca0ce245 100644
--- a/plugins/print-notifications/gsd-print-notifications.service.in
+++ b/plugins/print-notifications/gsd-print-notifications.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-print-notifications
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/rfkill/gsd-rfkill.service.in b/plugins/rfkill/gsd-rfkill.service.in
index 3dbb5150..554f3ac3 100644
--- a/plugins/rfkill/gsd-rfkill.service.in
+++ b/plugins/rfkill/gsd-rfkill.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-rfkill
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/screensaver-proxy/gsd-screensaver-proxy.service.in 
b/plugins/screensaver-proxy/gsd-screensaver-proxy.service.in
index bd90ced6..fe134a4d 100644
--- a/plugins/screensaver-proxy/gsd-screensaver-proxy.service.in
+++ b/plugins/screensaver-proxy/gsd-screensaver-proxy.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-screensaver-proxy
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/sharing/gsd-sharing.service.in b/plugins/sharing/gsd-sharing.service.in
index f4572482..30b96443 100644
--- a/plugins/sharing/gsd-sharing.service.in
+++ b/plugins/sharing/gsd-sharing.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-sharing
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/smartcard/gsd-smartcard.service.in b/plugins/smartcard/gsd-smartcard.service.in
index e8a5a6a0..801c8986 100644
--- a/plugins/smartcard/gsd-smartcard.service.in
+++ b/plugins/smartcard/gsd-smartcard.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-smartcard
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/sound/gsd-sound.service.in b/plugins/sound/gsd-sound.service.in
index 2babe33d..332c9ed2 100644
--- a/plugins/sound/gsd-sound.service.in
+++ b/plugins/sound/gsd-sound.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-sound
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/wacom/gsd-wacom.service.in b/plugins/wacom/gsd-wacom.service.in
index 56cf0f7e..1eebfff4 100644
--- a/plugins/wacom/gsd-wacom.service.in
+++ b/plugins/wacom/gsd-wacom.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-wacom
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/wwan/gsd-wwan.service.in b/plugins/wwan/gsd-wwan.service.in
index fd8bfdc8..2b832133 100644
--- a/plugins/wwan/gsd-wwan.service.in
+++ b/plugins/wwan/gsd-wwan.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-wwan
 Restart=on-failure
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5
diff --git a/plugins/xsettings/gsd-xsettings.service.in b/plugins/xsettings/gsd-xsettings.service.in
index 36527f20..b0f7a347 100644
--- a/plugins/xsettings/gsd-xsettings.service.in
+++ b/plugins/xsettings/gsd-xsettings.service.in
@@ -16,3 +16,4 @@ Type=dbus
 ExecStart=@libexecdir@/gsd-xsettings
 Restart=on-abnormal
 BusName=@plugin_dbus_name@
+TimeoutStopSec=5