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 1/3] 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. + From f0c5cda25150d49f9433408e08ed689a92395df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 1 Dec 2018 22:58:31 +0100 Subject: [PATCH 2/3] man: add missing descriptions of fstab options to systemd.swap(5) --- man/systemd.mount.xml | 4 ++-- man/systemd.swap.xml | 24 +++++++++++++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index daee201eeb..abd43ee684 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -263,7 +263,7 @@ for details. - + Configure how long systemd should wait for a @@ -303,7 +303,7 @@ - The file system or swap structure will be initialized + The file system will be initialized on the device. If the device is not "empty", i.e. it contains any signature, the operation will be skipped. It is hence expected that this option remains set even after the device has been initalized. diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 998a047ec5..073c2b3a27 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -6,7 +6,9 @@ SPDX-License-Identifier: LGPL-2.1+ --> - + + systemd.swap systemd @@ -141,6 +143,26 @@ successfully. + + + + + + + The swap structure will be initialized on the device. If the device is not + "empty", i.e. it contains any signature, the operation will be skipped. It is hence expected + that this option remains set even after the device has been initalized. + + Note that this option can only be used in /etc/fstab, and will be + ignored when part of the Options= setting in a unit file. + + See + systemd-mkswap@.service8 + and the discussion of + wipefs8 + in systemd.mount5. + + From c2f4bcfcc10115179d518671bbb897d28fc56eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 3 Dec 2018 23:54:20 +0100 Subject: [PATCH 3/3] shared/generator: reword comment for clarity --- src/shared/generator.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/shared/generator.c b/src/shared/generator.c index 13591ac892..0adaaf2c56 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -197,10 +197,9 @@ int generator_write_timeouts( const char *opts, char **filtered) { - /* Allow configuration how long we wait for a device that - * backs a mount point to show up. This is useful to support - * endless device timeouts for devices that show up only after - * user input, like crypto devices. */ + /* Configure how long we wait for a device that backs a mount point or a + * swap partition to show up. This is useful to support endless device timeouts + * for devices that show up only after user input, like crypto devices. */ _cleanup_free_ char *node = NULL, *unit = NULL, *timeout = NULL; usec_t u;