chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dhcp: the localhost isn't valid as hostname either
[elogind.git]
/
man
/
systemd.service.xml
diff --git
a/man/systemd.service.xml
b/man/systemd.service.xml
index 01312502601d57057f32d36b3b5c688a7f335fa8..5c4bd6569f0ca7131281ea70fd58b8f7b57ae6a2 100644
(file)
--- a/
man/systemd.service.xml
+++ b/
man/systemd.service.xml
@@
-605,11
+605,12
@@
ExecStart=/bin/echo $ONE $TWO ${TWO}</programlisting>
time span value such as "5min
20s". Pass <literal>0</literal> to
disable the timeout logic. Defaults to
time span value such as "5min
20s". Pass <literal>0</literal> to
disable the timeout logic. Defaults to
- <varname>TimeoutStartSec=</varname> from
+ <varname>
Default
TimeoutStartSec=</varname> from
the manager configuration file, except
when <varname>Type=oneshot</varname> is
used, in which case the timeout
the manager configuration file, except
when <varname>Type=oneshot</varname> is
used, in which case the timeout
- is disabled by default.
+ is disabled by default
+ (see <citerefentry><refentrytitle>systemd-systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
</para></listitem>
</varlistentry>
</para></listitem>
</varlistentry>
@@
-628,8
+629,9
@@
ExecStart=/bin/echo $ONE $TWO ${TWO}</programlisting>
time span value such as "5min
20s". Pass <literal>0</literal> to disable
the timeout logic. Defaults to
time span value such as "5min
20s". Pass <literal>0</literal> to disable
the timeout logic. Defaults to
- <varname>TimeoutStartSec=</varname> from the
- manager configuration file.
+ <varname>DefaultTimeoutStopSec=</varname> from the
+ manager configuration file
+ (see <citerefentry><refentrytitle>systemd-systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
</para></listitem>
</varlistentry>
</para></listitem>
</varlistentry>