summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-05 09:16:58 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-05 20:45:10 -0500
commit038193efa6c00e852110f17383ef2786136f4f81 (patch)
tree057ef3213e4a6a5086e44a948184e9e39ac01556
parent8232e39e7cf32071e11b3b04839e6c98fbc81d0f (diff)
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.
-rw-r--r--units/basic.target3
-rw-r--r--units/poweroff.target2
-rw-r--r--units/reboot.target2
3 files changed, 0 insertions, 7 deletions
diff --git a/units/basic.target b/units/basic.target
index eee3e6b774..abb63ec560 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 dd92d816ca..71871033a5 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 668b98d9e4..dec8f56796 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