summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-06 08:15:48 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-06 08:17:45 -0500
commit58f2fab16da947052756b7f9ace40f6ee7fa1519 (patch)
treebbea9c39b5ce2826348b56ede8e1a2148ba1aaa6 /units
parentf6ba8671d83f9fce9a00045d8fa399a1c07ba7fc (diff)
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.
Diffstat (limited to 'units')
-rw-r--r--units/poweroff.target2
-rw-r--r--units/reboot.target2
2 files changed, 4 insertions, 0 deletions
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