diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-system.conf.xml | 24 | ||||
| -rw-r--r-- | man/systemd.mount.xml | 4 | ||||
| -rw-r--r-- | man/systemd.service.xml | 6 | ||||
| -rw-r--r-- | man/systemd.socket.xml | 4 | ||||
| -rw-r--r-- | man/systemd.swap.xml | 4 |
5 files changed, 33 insertions, 9 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index e8cf8a9cb2..c1f26484ee 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -61,7 +61,6 @@ otherwise <filename>user.conf</filename>. These configuration files contain a few settings controlling basic manager operations.</para> - </refsect1> <refsect1> @@ -95,6 +94,29 @@ </varlistentry> <varlistentry> + <term><varname>DefaultTimeoutStartSec=</varname></term> + <term><varname>DefaultTimeoutStopSec=</varname></term> + <term><varname>DefaultRestartSec=</varname></term> + + <listitem><para>Configures the default + time-outs for starting and stopping of + units, as well as the default time to + sleep between automatic restarts of a + units, as configured per-unit in + <varname>TimeoutStartSec=</varname>, + <varname>TimeoutStopSec=</varname> and + <varname>RestartSec=</varname> (for + service units see + <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> + for details on the per-unit + settings). For non-service units + <varname>DefaultTimeoutStartSec=</varname> + sets the default + <varname>TimeoutSec=</varname> value. + </para></listitem> + </varlistentry> + + <varlistentry> <term><varname>CPUAffinity=</varname></term> <listitem><para>Configures the initial diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index 217289ab75..bed2975509 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -260,8 +260,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.</para></listitem> + logic. Default value is setted up in manager configuration + file via <term><varname>DefaultTimeoutStart=</varname></term>.</para></listitem> </varlistentry> </variablelist> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index b1e3af2fef..0cb3d9e351 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -524,7 +524,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, except when + logic. Defaults to <varname>TimeoutStartSec=</varname> in + manager configuration file, except when <varname>Type=oneshot</varname> is 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 <varname>TimeoutStartSec=</varname> in + manager configuration file. </para></listitem> </varlistentry> diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 8c88d9f8aa..1c78562e8a 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -679,8 +679,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.</para></listitem> + logic. Defaults to <varname>TimeoutStartSec=</varname> in + manager configuration file.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 813ae6c942..13f6c8441a 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -186,8 +186,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.</para></listitem> + logic. Defaults to <varname>TimeoutStartSec=</varname> in + manager configuration file.</para></listitem> </varlistentry> </variablelist> |