X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=22c0d5ae9fc33e212b8b35307f9c554f38955b11;hb=290c7324ca6ed22bcb6f4d644765aefeb47dc9de;hp=b1e3af2fefa485aead9214ad94c052c2fccc9b52;hpb=accdd018ede77ef1c057775396c18c73406cbcb4;p=elogind.git
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index b1e3af2fe..22c0d5ae9 100644
--- 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
- logic. Defaults to 90s, except when
+ logic. Defaults to TimeoutStartSec= from the
+ manager configuration file, except when
Type=oneshot is
- used in which case the timeout
+ used, in which case the timeout
is disabled by default.
@@ -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
- logic. Defaults to 90s.
+ logic. Defaults to TimeoutStartSec= from the
+ manager configuration file.
@@ -861,12 +863,15 @@
these two options, this rate limiting
may be modified. Use
StartLimitInterval=
- to configure the checking interval
- (defaults to 10s, set to 0 to disable
+ to configure the checking interval (defaults to
+ DefaultStartLimitInterval= in
+ manager configuration file, set to 0 to disable
any kind of rate limiting). Use
StartLimitBurst= to
configure how many starts per interval
- are allowed (defaults to 5). These
+ are allowed (defaults to
+ DefaultStartLimitBurst= in
+ manager configuration file). These
configuration options are particularly
useful in conjunction with
Restart=, however