diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-01-26 20:23:12 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2023-02-01 11:52:29 +0000 |
| commit | e4c7b5f5173d92cfc5378c75fa3ab7ef0252f32b (patch) | |
| tree | 3c08be3d44d3b68ebe48b9a9ad8d89aa542fcc19 /man/systemd.service.xml | |
| parent | 15796f28ead21158b3e1d77eb72219b2cdb1230c (diff) | |
| download | systemd-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.service.xml')
| -rw-r--r-- | man/systemd.service.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml index d44c48c7b1..a1a32e8cd9 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -612,11 +612,12 @@ <varlistentry> <term><varname>TimeoutStartSec=</varname></term> - <listitem><para>Configures the time to wait for start-up. If a daemon service does not signal start-up - completion within the configured time, the service will be considered failed and will be shut down again. The - precise action depends on the <varname>TimeoutStartFailureMode=</varname> option. Takes a unit-less value in - seconds, or a time span value such as "5min 20s". Pass <literal>infinity</literal> to disable the timeout logic. - Defaults to <varname>DefaultTimeoutStartSec=</varname> from the manager configuration file, except when + <listitem><para>Configures the time to wait for start-up. If a daemon service does not signal + start-up completion within the configured time, the service will be considered failed and will be + shut down again. The precise action depends on the <varname>TimeoutStartFailureMode=</varname> + option. Takes a unit-less value in seconds, or a time span value such as "5min 20s". Pass + <literal>infinity</literal> to disable the timeout logic. Defaults to + <varname>DefaultTimeoutStartSec=</varname> set in the manager, except when <varname>Type=oneshot</varname> is used, in which case the timeout is disabled by default (see <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>). </para> |