X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=1cfdac9267ef535216dbefc53f403bacb27aeb10;hb=1e158d273bb63883566358cbb886cd4167421df6;hp=47c50315ae941e58d5b923da3b8e89a355d37d8c;hpb=1a13e31d275430ffba713c8a68ee7f22093c29e0;p=elogind.git diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 47c50315a..1cfdac926 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -195,9 +195,9 @@ in a both simpler and more flexible system. Some unit names reflect paths existing in the - file system name space. Example: a device unit + file system namespace. Example: a device unit dev-sda.device refers to a device - with the device node /dev/sda in + with the device node /dev/sda in the file system namespace. If this applies a special way to escape the path name is used, so that the result is usable as part of a file name. Basically, @@ -245,7 +245,7 @@ - Unit load path + Unit Load Path Unit files are loaded from a set of paths determined during compilation, described in the two @@ -254,7 +254,7 @@ lower in the hierarchy, thus allowing overrides. - When systemd is running in session mode + When systemd is running in user mode () and the variable $SYSTEMD_UNIT_PATH is set, this contents of this variable overrides the unit load @@ -278,14 +278,11 @@ /run/systemd/generator.early - Generated units - - - &SYSTEM_CONFIG_UNIT_PATH; - Local configuration + Generated units (early) /etc/systemd/system + Local configuration /run/systemd/systemd @@ -293,26 +290,19 @@ /run/systemd/generator - Generated units + Generated units (middle) /usr/local/lib/systemd/system Units for local packages - - &systemunitdir; - Systemd package configuration - /usr/lib/systemd/system - Units for installed packages - - - /lib/systemd/system + Units for installed packages /run/systemd/generator.late - Generated units + Generated units (late) @@ -335,14 +325,11 @@ /tmp/systemd-generator.early.XXXXXX - Generated units - - - &USER_CONFIG_UNIT_PATH; - Local configuration + Generated units (early) /etc/systemd/user + Local configuration /run/systemd/user @@ -350,40 +337,24 @@ /tmp/systemd-generator.XXXXXX - Generated units + Generated units (middle) /usr/local/lib/systemd/user - Units for local packages - - - /usr/local/share/systemd/user - - - &userunitdir; - Systemd package configuration + Units for local packages /usr/lib/systemd/user - Units for installed packages - - - /usr/share/systemd/user + Units for installed packages /tmp/systemd-generator.late.XXXXXX - Generated units + Generated units (late) - Note: the paths listed above are set at - compilation time and differ between distributions. The - "authorative" list is printed by - systemd at during start and daemon - reconfiguration. - Additional units might be loaded into systemd ("linked") from directories not on the unit load path. See the link command for @@ -675,7 +646,7 @@ Lists one or more units that are activated when this unit enters the - 'failed' + failed state. @@ -841,7 +812,7 @@ time. If this time limit is reached the job will be cancelled, the unit however will not change state or even - enter the 'failed' + enter the failed mode. This value defaults to 0 (job timeouts disabled), except for device units. NB: this timeout is independent @@ -900,7 +871,7 @@ to ConditionPathExists= is prefixed with an exclamation mark - ('!'), the test is negated, and the unit + (!), the test is negated, and the unit is only started if the path does not exist. @@ -969,7 +940,7 @@ exclamation mark unset). The argument must either be a single word, or an assignment (i.e. two words, separated - '='). In the former + =). In the former case the kernel command line is searched for the word appearing as is, or as left hand side of an @@ -1012,8 +983,11 @@ ConditionSecurity= may be used to check whether the given security module is enabled on the - system. Currently the only recognized - value is selinux. + system. Currently the recognized values + values are selinux, + apparmor, + ima and + smack. The test may be negated by prepending an exclamation mark. @@ -1160,13 +1134,14 @@ Also= Additional units to - install when this unit is - installed. If the user requests - installation of a unit with this - option configured, + install/deinstall when this unit is + installed/deinstalled. If the user + requests installation/deinstallation + of a unit with this option configured, systemctl enable - will automatically install units - listed in this option as + and systemctl + disable will automatically + install/uninstall units listed in this option as well. @@ -1233,7 +1208,7 @@ %f Unescaped file name - This is either the unescaped instance name (if applicable) with / prepended (if applicable), or the prefix name similarly prepended with /. + This is either the unescaped instance name (if applicable) with / prepended (if applicable), or the prefix name similarly prepended with /. %c @@ -1242,13 +1217,13 @@ %r - Root control group path of systemd - + Root control group path where units are placed. + For system instances this usually resolves to /system, except in containers, where the path might be prefixed with the container's root control group. %R - Parent directory of the root control group path of systemd - + Parent directory of the control group path where units are placed. + For system instances this usually resolves to /, except in containers, where this resolves to the container's root directory. This specifier is particularly useful in the ControlGroup= setting (see systemd.exec5). %t @@ -1273,14 +1248,7 @@ %s User shell - This is the shell of the configured - user of the unit, or (if none is set) the user - running the systemd instance. If the user is - root (UID equal to 0), the - shell configured in account database is - ignored and /bin/sh is - always used. - + This is the shell of the configured user of the unit, or (if none is set) the user running the systemd instance. If the user is root (UID equal to 0), the shell configured in account database is ignored and /bin/sh is always used. %m