From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 6 Nov 2014 13:15:48 +0000 (-0500)
Subject: units: restore job timeouts for poweroff and reboot
X-Git-Tag: v218~538
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58f2fab16da947052756b7f9ace40f6ee7fa1519;p=thirdparty%2Fsystemd.git

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 71871033a54..dd92d816cac 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 dec8f567964..668b98d9e45 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