summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-04-06 20:34:11 +0200
committerLennart Poettering <lennart@poettering.net>2015-04-07 15:42:25 +0200
commitf5a05fb578cddcf6e46be68e4a38fdbc4b853f16 (patch)
tree755afff484db1d0b2359820bce5027e18c30e300 /man
parentceb242292630b4633aa707b565585a1e8bcbfeb8 (diff)
man: document default timeouts and start limit parameters
Diffstat (limited to 'man')
-rw-r--r--man/systemd-system.conf.xml11
1 files changed, 9 insertions, 2 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 1b74ed38f7..c06accd791 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -260,7 +260,11 @@
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details on the per-unit settings). For non-service units,
<varname>DefaultTimeoutStartSec=</varname> sets the default
- <varname>TimeoutSec=</varname> value. </para></listitem>
+ <varname>TimeoutSec=</varname>
+ value. <varname>DefaultTimeoutStartSec=</varname> and
+ <varname>DefaultTimeoutStopSec=</varname> default to
+ 90s. <varname>DefaultRestartSec=</varname> defaults to
+ 100ms.</para></listitem>
</varlistentry>
<varlistentry>
@@ -272,7 +276,10 @@
<varname>StartLimitInterval=</varname> and
<varname>StartLimitBurst=</varname>. See
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- for details on the per-service settings.</para></listitem>
+ for details on the per-service settings.
+ <varname>DefaultStartLimitInterval=</varname> defaults to
+ 10s. <varname>DefaultStartLimitBurst=</varname> defaults to
+ 5.</para></listitem>
</varlistentry>
<varlistentry>