From e4c7b5f5173d92cfc5378c75fa3ab7ef0252f32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 26 Jan 2021 20:23:12 +0100 Subject: core: split system/user job timeouts and make them configurable Config options are -Ddefault-timeout-sec= and -Ddefault-user-timeout-sec=. Existing -Dupdate-helper-user-timeout= is renamed to -Dupdate-helper-user-timeout-sec= for consistency. All three options take an integer value in seconds. The renaming and type-change of the option is a small compat break, but it's just at compile time and result in a clear error message. I also doubt that anyone was actually using the option. This commit separates the user manager timeouts, but keeps them unchanged at 90 s. The timeout for the user manager is set to 4/3*user-timeout, which means that it is still 120 s. Fedora wants to experiment with lower timeouts, but doing this via a patch would be annoying and more work than necessary. Let's make this easy to configure. --- units/user@.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'units') diff --git a/units/user@.service.in b/units/user@.service.in index 1558764909..5e95efe1d1 100644 --- a/units/user@.service.in +++ b/units/user@.service.in @@ -23,6 +23,6 @@ Slice=user-%i.slice KillMode=mixed Delegate=pids memory cpu TasksMax=infinity -TimeoutStopSec=120s +TimeoutStopSec={{ DEFAULT_USER_TIMEOUT_SEC*4//3 }}s KeyringMode=inherit OOMScoreAdjust=100 -- cgit v1.2.1