units: define appropriate job timeout actions when boot or shutdown timeouts are hit

Using the new JobTimeoutAction= setting make sure we power off the
machine after basic.target is queued for longer than 15min but not
executed. Similar, if poweroff.target is queued for longer than 30min
but does not complete, forcibly turn off the system. Similar, if
reboot.target is queued for longer than 30min but does not complete,
forcibly reboot the system.

diff --git a/units/basic.target b/units/basic.target
index b890d48bbceca74b5583a69bf542cefcae62467a..228f62c4b13c63fffa06ca68c83292d46df9f10b 100644 (file)
--- a/units/basic.target
+++ b/units/basic.target
@@ -11,3 +11,5 @@ Documentation=man:systemd.special(7)
 Requires=sysinit.target
 Wants=sockets.target timers.target paths.target slices.target
 After=sysinit.target sockets.target timers.target paths.target slices.target
+JobTimeoutSec=15min
+JobTimeoutAction=poweroff-force

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
+JobTimeoutSec=30min
+JobTimeoutAction=poweroff-force
 
 [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
+JobTimeoutSec=30min
+JobTimeoutAction=reboot-force
 
 [Install]
 Alias=ctrl-alt-del.target