From 8601482cd82d615330a3cf93da245ff4465f4345 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 1 Apr 2019 17:29:02 +0200 Subject: [PATCH 1/3] man: tweak XyzDirectory= table a bit --- man/systemd.exec.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 8cbc4bb93f..6c7a78643e 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -851,40 +851,40 @@ CapabilityBoundingSet=~CAP_B CAP_C - Locations - for system - for users - Environment variable + Directory + Below path for system units + Below path for user units + Environment variable set RuntimeDirectory= - /run + /run/ $XDG_RUNTIME_DIR $RUNTIME_DIRECTORY StateDirectory= - /var/lib + /var/lib/ $XDG_CONFIG_HOME $STATE_DIRECTORY CacheDirectory= - /var/cache + /var/cache/ $XDG_CACHE_HOME $CACHE_DIRECTORY LogsDirectory= - /var/log - $XDG_CONFIG_HOME/log + /var/log/ + $XDG_CONFIG_HOME/log/ $LOGS_DIRECTORY ConfigurationDirectory= - /etc + /etc/ $XDG_CONFIG_HOME $CONFIGURATION_DIRECTORY From 6d463b8aed276e889f84d53abe2ccb52716f7faa Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 1 Apr 2019 17:29:12 +0200 Subject: [PATCH 2/3] man: refer to innermost directory as innermost, not as "lowest" Let's avoid confusion whether the root is at the top or of the bottom of the directory tree. Moreover we use "innermost" further down for the same concept, so let's stick to the same terminology here. --- man/systemd.exec.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 6c7a78643e..f8c46a2995 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -892,10 +892,10 @@ CapabilityBoundingSet=~CAP_B CAP_C - In case of RuntimeDirectory= the lowest subdirectories are removed when the unit is - stopped. It is possible to preserve the specified directories in this case if - RuntimeDirectoryPreserve= is configured to or - (see below). The directories specified with StateDirectory=, + In case of RuntimeDirectory= the innermost subdirectories are removed when + the unit is stopped. It is possible to preserve the specified directories in this case if + RuntimeDirectoryPreserve= is configured to or + (see below). The directories specified with StateDirectory=, CacheDirectory=, LogsDirectory=, ConfigurationDirectory= are not removed when the unit is stopped. From 58031d99c6320855b86f4890baa9165597e3d841 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 1 Apr 2019 17:30:45 +0200 Subject: [PATCH 3/3] man: be clearer that .timer time expressions need to be reset to override them let's be clearer about the overriding concept for OnCalendar= settings. Prompted by this thread: https://lists.freedesktop.org/archives/systemd-devel/2019-March/042351.html --- man/systemd.timer.xml | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml index 9cfb453399..f1afcf6b7e 100644 --- a/man/systemd.timer.xml +++ b/man/systemd.timer.xml @@ -142,12 +142,12 @@ - Multiple directives may be combined of the same and of - different types. For example, by combining - OnBootSec= and - OnUnitActiveSec=, it is possible to define - a timer that elapses in regular intervals and activates a - specific service each time. + Multiple directives may be combined of the same and of different types, in which case the timer + unit will trigger whenever any of the specified timer expressions elapse. For example, by combining + OnBootSec= and OnUnitActiveSec=, it is possible to define a + timer that elapses in regular intervals and activates a specific service each time. Moreover, both + monotonic time expressions and OnCalendar= calendar expressions may be combined in + the same timer unit. The arguments to the directives are time spans configured in seconds. Example: "OnBootSec=50" means 50s after @@ -162,13 +162,12 @@ and the configured unit is started. This is not the case for timers defined in the other directives. - These are monotonic timers, independent of wall-clock - time and timezones. If the computer is temporarily suspended, - the monotonic clock stops too. + These are monotonic timers, independent of wall-clock time and timezones. If the computer is + temporarily suspended, the monotonic clock pauses, too. - If the empty string is assigned to any of these options, - the list of timers is reset, and all prior assignments will - have no effect. + If the empty string is assigned to any of these options, the list of timers is reset (both + monotonic timers and OnCalendar= timers, see below), and all prior assignments + will have no effect. Note that timers do not necessarily expire at the precise time configured with these settings, as they are @@ -192,7 +191,13 @@ the AccuracySec= setting below. - May be specified more than once. + May be specified more than once, in which case the timer unit will trigger whenever any of the + specified expressions elapse. Moreover calendar timers and monotonic timers (see above) may be + combined within the same timer unit. + + If the empty string is assigned to any of these options, the list of timers is reset (both + OnCalendar= timers and monotonic timers, see above), and all prior assignments + will have no effect.