[systemd-commits] units/poweroff.target units/reboot.target

[Zbigniew Jędrzejewski-Szmek]

 units/poweroff.target |    2 ++
 units/reboot.target   |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 58f2fab16da947052756b7f9ace40f6ee7fa1519
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Nov 6 08:15:48 2014 -0500

    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 7187103..dd92d81 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 dec8f56..668b98d 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