X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=803eff24aa691e918e0e74939ac758222d286ca3;hb=994701548d3ea6aafe3d9c47d51f701878118d65;hp=dd3a4a7cd5cc15387303d7966454f432e6c9a4ee;hpb=cf7d80a5fe549d4db11800015e02220dccec3096;p=elogind.git diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index dd3a4a7cd..803eff24a 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -73,6 +73,7 @@ $XDG_CONFIG_HOME/systemd/user/* $HOME/.config/systemd/user/* /etc/systemd/user/* +$XDG_RUNTIME_DIR/systemd/user/* /run/systemd/user/* $XDG_DATA_HOME/systemd/user/* $HOME/.local/share/systemd/user/* @@ -180,10 +181,10 @@ foo.service.wants/ may exist. All unit files symlinked from such a directory are implicitly added as dependencies of type - Wanted= to the unit. This is useful + Wants= to the unit. This is useful to hook units into the start-up of other units, without having to modify their unit files. For details - about the semantics of Wanted=, see + about the semantics of Wants=, see below. The preferred way to create symlinks in the .wants/ directory of a unit file is with the enable command of the @@ -203,7 +204,12 @@ settings to a unit, without having to modify their unit files. Make sure that the file that is included has the appropriate section headers before any - directive. + directive. Note that for instanced units this logic + will first look for the instance + .d/ subdirectory and read its + .conf files, followed by the + template .d/ subdirectory and reads + its .conf files. Note that while systemd offers a flexible dependency system between units it is recommended to @@ -221,7 +227,7 @@ result is usable as part of a filename. Basically, given a path, "/" is replaced by "-", and all unprintable characters and the "-" are replaced by - C-style "\x20" escapes. The root directory "/" is + C-style "\x2d" escapes. The root directory "/" is encoded as single dash, while otherwise the initial and ending "/" is removed from all paths during transformation. This escaping is reversible. @@ -338,6 +344,10 @@ /etc/systemd/user Local configuration + + $XDG_RUNTIME_DIR/systemd/user + Runtime units (only used when $XDG_RUNTIME_DIR is set) + /run/systemd/user Runtime units @@ -878,20 +888,22 @@ JobTimeoutSec= - - When clients are - waiting for a job of this unit to - complete, time out after the specified - time. If this time limit is reached, - the job will be cancelled, the unit - however will not change state or even - enter the failed - mode. This value defaults to 0 (job - timeouts disabled), except for device + JobTimeoutAction= + JobTimeoutRebootArgument= + + 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 + failed mode. This + value defaults to 0 (job timeouts + disabled), except for device units. NB: this timeout is independent from any unit-specific timeout (for example, the timeout set with - Timeout= in service + StartTimeoutSec= 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 @@ -901,7 +913,22 @@ timeout set with this option however is useful to abort only the job waiting for the unit state to - change. + change. + + JobTimeoutAction= + optionally configures an additional + action to take when the time-out is + hit. It takes the same values as the + per-service + StartLimitAction= + setting, see + systemd.service5 + for details. Defaults to + . JobTimeoutRebootArgument= + configures an optional reboot string + to pass to the + reboot2 + system call. @@ -1008,13 +1035,17 @@ openvz, lxc, lxc-libvirt, - systemd-nspawn to - test against a specific - implementation. If multiple - virtualization technologies are nested, - only the innermost is considered. The - test may be negated by prepending an - exclamation mark. + systemd-nspawn, + docker to test + against a specific implementation. See + systemd-detect-virt1 + for a full list of known + virtualization technologies and their + identifiers. If multiple + virtualization technologies are + nested, only the innermost is + considered. The test may be negated by + prepending an exclamation mark. ConditionHost= may be used to match against the @@ -1251,9 +1282,10 @@ [Install] Section Options - Unit file may include a [Install] section, which - carries installation information for the unit. This - section is not interpreted by + Unit file may include an + [Install] section, which carries + installation information for the unit. This section is + not interpreted by systemd1 during runtime. It is used exclusively by the enable and @@ -1265,7 +1297,7 @@ Alias= - A space-seperated list + A space-separated list of additional names this unit shall be installed under. The names listed here must have the same suffix (i.e. type) @@ -1498,7 +1530,7 @@ See Also systemd1, - systemctl8, + systemctl1, systemd.special7, systemd.service5, systemd.socket5, @@ -1513,6 +1545,7 @@ systemd.scope5, systemd.slice5, systemd.time7, + systemd-verify1, capabilities7, systemd.directives7, uname1