units: restore job timeouts for poweroff and reboot

It seems that there actually aren't any long running tasks which are
performed at shutdown. If it turns out that there actually are, this
should be revisited.

This reverts most of commit 038193efa6.

diff --git a/units/poweroff.target b/units/poweroff.target
index 71871033a541febb5cf71c9f44be3ad213052cb9..dd92d816cacafbc869f5ea32d6aeb1b0a7f28610 100644 (file)
--- a/units/poweroff.target
+++ b/units/poweroff.target
@@ -12,6 +12,8 @@ DefaultDependencies=no
 Requires=systemd-poweroff.service
 After=systemd-poweroff.service
 AllowIsolate=yes
 Requires=systemd-poweroff.service
 After=systemd-poweroff.service
 AllowIsolate=yes

+JobTimeoutSec=30min
+JobTimeoutAction=poweroff-force

 
 [Install]
 Alias=ctrl-alt-del.target
 
 [Install]
 Alias=ctrl-alt-del.target

diff --git a/units/reboot.target b/units/reboot.target
index dec8f5679645de6f25fb0ad5969992b369cdfe8d..668b98d9e45b2a68a80899b9a7b6b41b3268bf63 100644 (file)
--- a/units/reboot.target
+++ b/units/reboot.target
@@ -12,6 +12,8 @@ DefaultDependencies=no
 Requires=systemd-reboot.service
 After=systemd-reboot.service
 AllowIsolate=yes
 Requires=systemd-reboot.service
 After=systemd-reboot.service
 AllowIsolate=yes

+JobTimeoutSec=30min
+JobTimeoutAction=reboot-force

 
 [Install]
 Alias=ctrl-alt-del.target
 
 [Install]
 Alias=ctrl-alt-del.target