summaryrefslogtreecommitdiff
path: root/man/systemd-system.conf.xml
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-01-26 20:23:12 +0100
committerLuca Boccassi <luca.boccassi@gmail.com>2023-02-01 11:52:29 +0000
commite4c7b5f5173d92cfc5378c75fa3ab7ef0252f32b (patch)
tree3c08be3d44d3b68ebe48b9a9ad8d89aa542fcc19 /man/systemd-system.conf.xml
parent15796f28ead21158b3e1d77eb72219b2cdb1230c (diff)
downloadsystemd-e4c7b5f5173d92cfc5378c75fa3ab7ef0252f32b.tar.gz
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.
Diffstat (limited to 'man/systemd-system.conf.xml')
-rw-r--r--man/systemd-system.conf.xml34
1 files changed, 15 insertions, 19 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 481fa31e01..82a52e2150 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -349,25 +349,20 @@
<term><varname>DefaultTimeoutAbortSec=</varname></term>
<term><varname>DefaultRestartSec=</varname></term>
- <listitem><para>Configures the default timeouts for starting,
- stopping and aborting of units, as well as the default time to sleep
- between automatic restarts of units, as configured per-unit in
- <varname>TimeoutStartSec=</varname>,
- <varname>TimeoutStopSec=</varname>,
- <varname>TimeoutAbortSec=</varname> and
- <varname>RestartSec=</varname> (for services, see
+ <listitem><para>Configures the default timeouts for starting, stopping and aborting of units, as well
+ as the default time to sleep between automatic restarts of units, as configured per-unit in
+ <varname>TimeoutStartSec=</varname>, <varname>TimeoutStopSec=</varname>,
+ <varname>TimeoutAbortSec=</varname> and <varname>RestartSec=</varname> (for services, see
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- for details on the per-unit settings). Disabled by default, when
- service with <varname>Type=oneshot</varname> is used.
- For non-service units,
- <varname>DefaultTimeoutStartSec=</varname> sets the default
- <varname>TimeoutSec=</varname>
- value. <varname>DefaultTimeoutStartSec=</varname> and
- <varname>DefaultTimeoutStopSec=</varname> default to
- 90s. <varname>DefaultTimeoutAbortSec=</varname> is not set by default
- so that all units fall back to <varname>TimeoutStopSec=</varname>.
- <varname>DefaultRestartSec=</varname> defaults to
- 100ms.</para></listitem>
+ for details on the per-unit settings). For non-service units,
+ <varname>DefaultTimeoutStartSec=</varname> sets the default <varname>TimeoutSec=</varname> value.
+ </para>
+
+ <para><varname>DefaultTimeoutStartSec=</varname> and <varname>DefaultTimeoutStopSec=</varname>
+ default to &DEFAULT_TIMEOUT; in the system manager and &DEFAULT_USER_TIMEOUT; in the user manager.
+ <varname>DefaultTimeoutAbortSec=</varname> is not set by default so that all units fall back to
+ <varname>TimeoutStopSec=</varname>. <varname>DefaultRestartSec=</varname> defaults to 100 ms.
+ </para></listitem>
</varlistentry>
<varlistentry>
@@ -378,7 +373,8 @@
and <filename>/etc/crypttab</filename> (see
<citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>crypttab</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
- Defaults to 90s.</para></listitem>
+ Defaults to &DEFAULT_TIMEOUT; in the system manager and &DEFAULT_USER_TIMEOUT; in the user manager.
+ </para></listitem>
</varlistentry>
<varlistentry>