From de59724865767b688bb13b04f0c78ec5abc37867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 1 Dec 2018 22:36:13 +0100 Subject: [PATCH] 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. --- man/systemd.unit.xml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 2c66db854b..beafe84bb3 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -912,8 +912,6 @@ JobTimeoutSec= JobRunningTimeoutSec= - JobTimeoutAction= - JobTimeoutRebootArgument= When a job for this unit is queued, a time-out JobTimeoutSec= may be configured. Similarly, JobRunningTimeoutSec= 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. + + - JobTimeoutAction= optionally configures an additional action to take when the time-out - is hit. It takes the same values as StartLimitAction=. Defaults to . + + JobTimeoutAction= + JobTimeoutRebootArgument= + + JobTimeoutAction= optionally configures an additional action to take when + the time-out is hit, see description of JobTimeoutSec= and + JobRunningTimeoutSec= above. It takes the same values as + StartLimitAction=. Defaults to . JobTimeoutRebootArgument= configures an optional reboot string to pass to the - reboot2 - system call. + reboot2 system call. +