summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-10-28 01:49:39 +0100
committerLennart Poettering <lennart@poettering.net>2014-10-28 02:19:55 +0100
commit3898b80d409ae16b049d46f883bf763417bb4c8a (patch)
treed4b5f7aa2c7aeed720aebd5fa094c86622079e4d
parentf189ab18de69d3dee81117d7925fb370cd038f0f (diff)
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.
-rw-r--r--units/basic.target2
-rw-r--r--units/poweroff.target2
-rw-r--r--units/reboot.target2
3 files changed, 6 insertions, 0 deletions
diff --git a/units/basic.target b/units/basic.target
index b890d48bbc..228f62c4b1 100644
--- 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 71871033a5..dd92d816ca 100644
--- 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 dec8f56796..668b98d9e4 100644
--- 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