summaryrefslogtreecommitdiffstats
path: root/man/systemd-system.conf.xml
diff options
context:
space:
mode:
authorMikhail Kasimov <mikhail.kasimov@gmail.com>2019-01-15 13:52:34 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-01-15 13:56:35 +0100
commit06156ed2cf2bb6a1b83a379f5ac22a14db5eb8fa (patch)
treebeb4ae41ad67bc51d1ea323b53a42c08c3eda322 /man/systemd-system.conf.xml
parentRemove 'inline' attributes from static functions in .c files (#11426) (diff)
downloadsystemd-06156ed2cf2bb6a1b83a379f5ac22a14db5eb8fa.tar.xz
systemd-06156ed2cf2bb6a1b83a379f5ac22a14db5eb8fa.zip
Update systemd-system.conf.xml
Updating due to phrase "Defaults to DefaultTimeoutStartSec= from the manager configuration file, except when Type=oneshot is used, in which case the timeout is disabled by default (see systemd-system.conf)" from [0] https://github.com/systemd/systemd/blob/master/man/systemd.service.xml
Diffstat (limited to 'man/systemd-system.conf.xml')
-rw-r--r--man/systemd-system.conf.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 35da82ab1a..73458fd5c7 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -251,7 +251,9 @@
<varname>TimeoutStopSec=</varname> and
<varname>RestartSec=</varname> (for services, see
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- for details on the per-unit settings). For non-service units,
+ 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