clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-04 12:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

man: correct references to DefaultTimeout*Sec

Browse Source 
Noticed by thp on #systemd.

(cherry picked from commit 5e34b37c9f)

Conflicts:
	man/systemd.socket.xml
	man/systemd.swap.xml
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-10-26 18:23:41 -04:00
parent 40f1cc308d
commit 6e529058d0
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/systemd.service.xml
+6 -4
View File
@@ -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>
man/systemd.socket.xml
+6 -4
View File
@@ -717,16 +717,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> in
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>
man/systemd.swap.xml
+5 -3
View File
@@ -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> in
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>
src/core/socket.c
+1 -1
View File
@@ -29,7 +29,7 @@
#include <arpa/inet.h>
#include <mqueue.h>
#ifdef HAVE_XATTR
#include <attr/xattr.h>
//#include <attr/xattr.h>
#endif
#include "unit.h"