shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

man: split the descriptions of Job*TimeoutSec and JobTimeoutAction

Browse Source 
Those are really two different things, and it seems more natural to describe them
as separate items.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-12-01 22:36:13 +01:00
parent 63e688cc3b
commit de59724865
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
man/systemd.unit.xml
View File

@ -912,8 +912,6 @@
<varlistentry> <varlistentry>
<term><varname>JobTimeoutSec=</varname></term> <term><varname>JobTimeoutSec=</varname></term>
<term><varname>JobRunningTimeoutSec=</varname></term> <term><varname>JobRunningTimeoutSec=</varname></term>
<term><varname>JobTimeoutAction=</varname></term>
<term><varname>JobTimeoutRebootArgument=</varname></term>
<listitem><para>When a job for this unit is queued, a time-out <varname>JobTimeoutSec=</varname> may be <listitem><para>When a job for this unit is queued, a time-out <varname>JobTimeoutSec=</varname> may be
configured. Similarly, <varname>JobRunningTimeoutSec=</varname> starts counting when the queued job is actually configured. Similarly, <varname>JobRunningTimeoutSec=</varname> starts counting when the queued job is actually
@ -925,12 +923,20 @@
no effect on the unit itself, only on the job that might be pending for it. Or in other words: unit-specific no effect on the unit itself, only on the job that might be pending for it. Or in other words: unit-specific
timeouts are useful to abort unit state changes, and revert them. The job timeout set with this option however timeouts are useful to abort unit state changes, and revert them. The job timeout set with this option however
is useful to abort only the job waiting for the unit state to change.</para> is useful to abort only the job waiting for the unit state to change.</para>
</listitem>
</varlistentry>
<para><varname>JobTimeoutAction=</varname> optionally configures an additional action to take when the time-out <varlistentry>
is hit. It takes the same values as <varname>StartLimitAction=</varname>. Defaults to <option>none</option>. <term><varname>JobTimeoutAction=</varname></term>
<term><varname>JobTimeoutRebootArgument=</varname></term>
<listitem><para><varname>JobTimeoutAction=</varname> optionally configures an additional action to take when
the time-out is hit, see description of <varname>JobTimeoutSec=</varname> and
<varname>JobRunningTimeoutSec=</varname> above. It takes the same values as
<varname>StartLimitAction=</varname>. Defaults to <option>none</option>.
<varname>JobTimeoutRebootArgument=</varname> configures an optional reboot string to pass to the <varname>JobTimeoutRebootArgument=</varname> configures an optional reboot string to pass to the
<citerefentry><refentrytitle>reboot</refentrytitle><manvolnum>2</manvolnum></citerefentry> <citerefentry><refentrytitle>reboot</refentrytitle><manvolnum>2</manvolnum></citerefentry> system call.
system call.</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>