diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-08-07 20:46:34 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-08-07 20:46:49 -0400 |
| commit | 5e34b37c9fec5da130f6549ddabd8a2af5c9faac (patch) | |
| tree | 68e28fa361a39235bf198399466290d9cd63df75 /man | |
| parent | d1fab3fe88ae873b26b50359758776ad9e31968e (diff) | |
man: correct references to DefaultTimeout*Sec
Noticed by thp on #systemd.
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd.service.xml | 10 | ||||
| -rw-r--r-- | man/systemd.socket.xml | 10 | ||||
| -rw-r--r-- | man/systemd.swap.xml | 8 |
3 files changed, 17 insertions, 11 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 0131250260..5c4bd6569f 100644 --- 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 - <varname>TimeoutStartSec=</varname> from + <varname>DefaultTimeoutStartSec=</varname> from 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> @@ -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 - <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> diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 09a7311b85..9c9af531e8 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -722,16 +722,18 @@ finish. If a command does not exit within the configured time, the socket will be considered failed and be shut - down again. All commands still running, + down again. All commands still running will be terminated forcibly via <constant>SIGTERM</constant>, and after another delay of this time with <constant>SIGKILL</constant>. (See <option>KillMode=</option> in <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>.) 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 <varname>TimeoutStartSec=</varname> from the - manager configuration file.</para></listitem> + 20s". Pass <literal>0</literal> to disable the timeout + logic. Defaults to <varname>DefaultTimeoutStartSec=</varname> from the + manager configuration file + (see <citerefentry><refentrytitle>systemd-systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>). + </para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 492309e536..61901d268e 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -185,9 +185,11 @@ <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>.) 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 <varname>TimeoutStartSec=</varname> from the - manager configuration file.</para></listitem> + 20s". Pass <literal>0</literal> to disable the timeout + logic. Defaults to <varname>DefaultTimeoutStartSec=</varname> from the + manager configuration file + (see <citerefentry><refentrytitle>systemd-systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>). + </para></listitem> </varlistentry> </variablelist> |