X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=4f0bd64b121728c488e8ba1747f39348d55b5206;hb=f7db7a691c3f532cf60886312459f2baea755283;hp=47c50315ae941e58d5b923da3b8e89a355d37d8c;hpb=1a13e31d275430ffba713c8a68ee7f22093c29e0;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 47c50315a..4f0bd64b1 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -182,7 +182,7 @@
directive.
If a line starts with
- followed by a file name, the specified file will be
+ followed by a filename, the specified file will be
parsed at this point. Make sure that the file that is
included has the appropriate section headers before
any directives.
@@ -195,12 +195,12 @@
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,
+ 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
@@ -214,9 +214,9 @@
systemd looks for a unit configuration file it will
first search for the literal unit name in the
filesystem. If that yields no success and the unit
- name contains an @ character, systemd will look for a
+ name contains an @ character, systemd will look for a
unit template that shares the same name but with the
- instance string (i.e. the part between the @ character
+ instance string (i.e. the part between the @ character
and the suffix) removed. Example: if a service
getty@tty3.service is requested
and no file by that name is found, systemd will look
@@ -245,7 +245,7 @@
- Unit load path
+ Unit Load PathUnit 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/systemUnits 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
@@ -411,7 +382,7 @@
Documentation=
- A space separated list
+ A space-separated list
of URIs referencing documentation for
this unit or its
configuration. Accepted are only URIs
@@ -422,7 +393,7 @@
info:,
man:. For more
information about the syntax of these
- URIs see
+ URIs, see
uri7. The
URIs should be listed in order of
relevance, starting with the most
@@ -434,7 +405,7 @@
option may be specified more than once
in which case the specified list of
URIs is merged. If the empty string is
- assigned to this option the list is
+ assigned to this option, the list is
reset and all prior assignments will
have no effect.
@@ -675,7 +646,7 @@
Lists one or more
units that are activated when this
unit enters the
- 'failed'
+ failed
state.
@@ -698,8 +669,8 @@
RequiresMountsFor=
- Takes a space
- separated list of absolute paths. Automatically
+ Takes a space-separated
+ list of absolute paths. Automatically
adds dependencies of type
Requires= and
After= for all
@@ -826,7 +797,7 @@
highly recommended to leave this
option enabled for the majority of
common units. If set to
- this option
+ , this option
does not disable all implicit
dependencies, just non-essential
ones.
@@ -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.
@@ -1033,11 +1007,11 @@
ConditionHost=
may be used to match against the
- host name or machine ID of the
- host. This either takes a host name
+ hostname or machine ID of the
+ host. This either takes a hostname
string (optionally with shell style
globs) which is tested against the
- locally set host name as returned by
+ locally set hostname as returned by
gethostname2,
or a machine ID formatted as string
(see
@@ -1134,7 +1108,7 @@
time,
systemctl enable
will create symlinks from these names
- to the unit file name.
+ to the unit filename.
@@ -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.
@@ -1223,7 +1198,7 @@
%iInstance name
- For instantiated units: this is the string between the @ character and the suffix.
+ For instantiated units: this is the string between the @ character and the suffix.%I
@@ -1232,8 +1207,8 @@
%f
- Unescaped file name
- This is either the unescaped instance name (if applicable) with / prepended (if applicable), or the prefix name similarly prepended with /.
+ Unescaped filename
+ 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 @@
%sUser 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
@@ -1295,7 +1263,7 @@
%HHost name
- The host name of the running system.
+ The hostname of the running system.%%