From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 5 Nov 2014 14:16:58 +0000 (-0500)
Subject: units: disable job timeouts
X-Git-Tag: v218~540
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=038193efa6;hp=8232e39e7cf32071e11b3b04839e6c98fbc81d0f;p=elogind.git

units: disable job timeouts

For boot, we might kill fsck in the middle, with likely catastrophic
consequences.

On shutdown there might be other jobs, like downloading of updates for
installation, and other custom jobs. It seems better to schedule an
individual timeout on each one separately, when it is known what
timeout is useful.

Disable the timeouts for now, until we have a clearer picture of how
we can deal with long-running jobs.
---

diff --git a/units/basic.target b/units/basic.target
index eee3e6b77..abb63ec56 100644
--- a/units/basic.target
+++ b/units/basic.target
@@ -13,6 +13,3 @@ Requires=sysinit.target
 After=sysinit.target
 Wants=sockets.target timers.target paths.target slices.target
 After=sockets.target paths.target slices.target
-
-JobTimeoutSec=15min
-JobTimeoutAction=poweroff-force
diff --git a/units/poweroff.target b/units/poweroff.target
index dd92d816c..71871033a 100644
--- a/units/poweroff.target
+++ b/units/poweroff.target
@@ -12,8 +12,6 @@ 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 668b98d9e..dec8f5679 100644
--- a/units/reboot.target
+++ b/units/reboot.target
@@ -12,8 +12,6 @@ DefaultDependencies=no
 Requires=systemd-reboot.service
 After=systemd-reboot.service
 AllowIsolate=yes
-JobTimeoutSec=30min
-JobTimeoutAction=reboot-force
 
 [Install]
 Alias=ctrl-alt-del.target