diff options
| author |   Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-01 22:36:13 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-03 23:52:22 +0100 |
| commit | de59724865767b688bb13b04f0c78ec5abc37867 (patch) | |
| tree | 17baa4dc65d8851a6a6b4147905b63c8336d19ca /man | |
| parent | Merge pull request #11031 from poettering/gcc-attr-cleanup (diff) | |
| download | systemd-de59724865767b688bb13b04f0c78ec5abc37867.tar.gz systemd-de59724865767b688bb13b04f0c78ec5abc37867.tar.bz2 systemd-de59724865767b688bb13b04f0c78ec5abc37867.zip | |
man: split the descriptions of Job*TimeoutSec and JobTimeoutAction
Those are really two different things, and it seems more natural to describe them
as separate items.
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd.unit.xml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 2c66db854..beafe84bb 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -912,8 +912,6 @@ <varlistentry> <term><varname>JobTimeoutSec=</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 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 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> + </listitem> + </varlistentry> - <para><varname>JobTimeoutAction=</varname> optionally configures an additional action to take when the time-out - is hit. It takes the same values as <varname>StartLimitAction=</varname>. Defaults to <option>none</option>. + <varlistentry> + <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 - <citerefentry><refentrytitle>reboot</refentrytitle><manvolnum>2</manvolnum></citerefentry> - system call.</para></listitem> + <citerefentry><refentrytitle>reboot</refentrytitle><manvolnum>2</manvolnum></citerefentry> system call. + </para></listitem> </varlistentry> <varlistentry> |