|
 |
47313b1 |
From 93871b345b76480e99b9a135006cad47e10acd7f Mon Sep 17 00:00:00 2001
|
|
|
b397f2a |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
b397f2a |
Date: Sun, 2 Nov 2014 10:02:41 -0500
|
|
|
b397f2a |
Subject: [PATCH] Revert "units: define appropriate job timeout actions when
|
|
|
b397f2a |
boot or shutdown timeouts are hit"
|
|
|
b397f2a |
|
|
|
b397f2a |
This reverts commit 3898b80d409ae16b049d46f883bf763417bb4c8a.
|
|
|
b397f2a |
|
|
|
b397f2a |
We have various jobs that run during early boot and might cause
|
|
|
b397f2a |
basic.target not to be reached within 15 minutes. E.g. Fedora has
|
|
|
b397f2a |
fedora-autorelabel.service, which can take an arbitrarily long time on
|
|
|
b397f2a |
a large and slow drive.
|
|
|
b397f2a |
---
|
|
|
b397f2a |
units/basic.target | 2 --
|
|
|
b397f2a |
units/poweroff.target | 2 --
|
|
|
b397f2a |
units/reboot.target | 2 --
|
|
|
b397f2a |
3 files changed, 6 deletions(-)
|
|
|
b397f2a |
|
|
|
b397f2a |
diff --git a/units/basic.target b/units/basic.target
|
|
|
b397f2a |
index 228f62c4b1..b890d48bbc 100644
|
|
|
b397f2a |
--- a/units/basic.target
|
|
|
b397f2a |
+++ b/units/basic.target
|
|
|
b397f2a |
@@ -11,5 +11,3 @@ Documentation=man:systemd.special(7)
|
|
|
b397f2a |
Requires=sysinit.target
|
|
|
b397f2a |
Wants=sockets.target timers.target paths.target slices.target
|
|
|
b397f2a |
After=sysinit.target sockets.target timers.target paths.target slices.target
|
|
|
b397f2a |
-JobTimeoutSec=15min
|
|
|
b397f2a |
-JobTimeoutAction=poweroff-force
|
|
|
b397f2a |
diff --git a/units/poweroff.target b/units/poweroff.target
|
|
|
b397f2a |
index dd92d816ca..71871033a5 100644
|
|
|
b397f2a |
--- a/units/poweroff.target
|
|
|
b397f2a |
+++ b/units/poweroff.target
|
|
|
b397f2a |
@@ -12,8 +12,6 @@ DefaultDependencies=no
|
|
|
b397f2a |
Requires=systemd-poweroff.service
|
|
|
b397f2a |
After=systemd-poweroff.service
|
|
|
b397f2a |
AllowIsolate=yes
|
|
|
b397f2a |
-JobTimeoutSec=30min
|
|
|
b397f2a |
-JobTimeoutAction=poweroff-force
|
|
|
b397f2a |
|
|
|
b397f2a |
[Install]
|
|
|
b397f2a |
Alias=ctrl-alt-del.target
|
|
|
b397f2a |
diff --git a/units/reboot.target b/units/reboot.target
|
|
|
b397f2a |
index 668b98d9e4..dec8f56796 100644
|
|
|
b397f2a |
--- a/units/reboot.target
|
|
|
b397f2a |
+++ b/units/reboot.target
|
|
|
b397f2a |
@@ -12,8 +12,6 @@ DefaultDependencies=no
|
|
|
b397f2a |
Requires=systemd-reboot.service
|
|
|
b397f2a |
After=systemd-reboot.service
|
|
|
b397f2a |
AllowIsolate=yes
|
|
|
b397f2a |
-JobTimeoutSec=30min
|
|
|
b397f2a |
-JobTimeoutAction=reboot-force
|
|
|
b397f2a |
|
|
|
b397f2a |
[Install]
|
|
|
b397f2a |
Alias=ctrl-alt-del.target
|