chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: mark sd_bus_message_at_end public
[elogind.git]
/
man
/
systemd.service.xml
diff --git
a/man/systemd.service.xml
b/man/systemd.service.xml
index b1e3af2fefa485aead9214ad94c052c2fccc9b52..d1f4a2d7d76c9f73b9b9dad540e1ec9da90a16cd 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>