diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-04-29 18:40:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 18:40:19 +0200 |
| commit | db7076bf78bd8e466ae927b6d3ddf64190c8d299 (patch) | |
| tree | 58b5135da7e2b28b525e7b532644576bae750927 /man | |
| parent | Merge pull request #5783 from keszybz/compiler-warning-fixes (diff) | |
| parent | core/device: Use JobRunningTimeoutSec= for device units (diff) | |
| download | systemd-db7076bf78bd8e466ae927b6d3ddf64190c8d299.tar.xz systemd-db7076bf78bd8e466ae927b6d3ddf64190c8d299.zip | |
Merge pull request #5164 from Werkov/ordering-for-_netdev-devices
Ordering for _netdev devices
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd.unit.xml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 68bf0b2407..a7c37a0018 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -718,17 +718,20 @@ <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 may be configured. If this time limit is - reached, the job will be cancelled, the unit however will not change state or even enter the - <literal>failed</literal> mode. This value defaults to <literal>infinity</literal> (job timeouts disabled), - except for device units. NB: this timeout is independent from any unit-specific timeout (for example, the - timeout set with <varname>TimeoutStartSec=</varname> in service units) as the job timeout has 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><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 + started. If either time limit is reached, the job will be cancelled, the unit however will not change state or + even enter the <literal>failed</literal> mode. This value defaults to <literal>infinity</literal> (job timeouts + disabled), except for device units (<varname>JobRunningTimeoutSec=</varname> defaults to + <varname>DefaultTimeoutStartSec=</varname>). NB: this timeout is independent from any unit-specific timeout + (for example, the timeout set with <varname>TimeoutStartSec=</varname> in service units) as the job timeout has + 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> <para><varname>JobTimeoutAction=</varname> optionally configures an additional |