chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
loopback-setup: move to rtnl
[elogind.git]
/
man
/
systemd.service.xml
diff --git
a/man/systemd.service.xml
b/man/systemd.service.xml
index b1e3af2fefa485aead9214ad94c052c2fccc9b52..22c0d5ae9fc33e212b8b35307f9c554f38955b11 100644
(file)
--- a/
man/systemd.service.xml
+++ b/
man/systemd.service.xml
@@
-524,9
+524,10
@@
Takes a unit-less value in seconds, or a
time span value such as "5min
20s". Pass 0 to disable the timeout
Takes a unit-less value in seconds, or a
time span value such as "5min
20s". Pass 0 to disable the timeout
- logic. Defaults to 90s, except when
+ logic. Defaults to <varname>TimeoutStartSec=</varname> from the
+ manager configuration file, except when
<varname>Type=oneshot</varname> is
<varname>Type=oneshot</varname> is
- used in which case the timeout
+ used
,
in which case the timeout
is disabled by default.
</para></listitem>
</varlistentry>
is disabled by default.
</para></listitem>
</varlistentry>
@@
-545,7
+546,8
@@
Takes a unit-less value in seconds, or a
time span value such as "5min
20s". Pass 0 to disable the timeout
Takes a unit-less value in seconds, or a
time span value such as "5min
20s". Pass 0 to disable the timeout
- logic. Defaults to 90s.
+ logic. Defaults to <varname>TimeoutStartSec=</varname> from the
+ manager configuration file.
</para></listitem>
</varlistentry>
</para></listitem>
</varlistentry>
@@
-861,12
+863,15
@@
these two options, this rate limiting
may be modified. Use
<varname>StartLimitInterval=</varname>
these two options, this rate limiting
may be modified. Use
<varname>StartLimitInterval=</varname>
- to configure the checking interval
- (defaults to 10s, set to 0 to disable
+ to configure the checking interval (defaults to
+ <varname>DefaultStartLimitInterval=</varname> in
+ manager configuration file, set to 0 to disable
any kind of rate limiting). Use
<varname>StartLimitBurst=</varname> to
configure how many starts per interval
any kind of rate limiting). Use
<varname>StartLimitBurst=</varname> to
configure how many starts per interval
- are allowed (defaults to 5). These
+ are allowed (defaults to
+ <varname>DefaultStartLimitBurst=</varname> in
+ manager configuration file). These
configuration options are particularly
useful in conjunction with
<varname>Restart=</varname>, however
configuration options are particularly
useful in conjunction with
<varname>Restart=</varname>, however