X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=1b71538c8294f3a10ba54fa1a685f9e6130a266c;hb=42539b5e38eebd54173c6064ec394ccc3054a8ad;hp=5ab988178de3e9f4cc388a79bc1ac71b514bae2c;hpb=9d995d54b54dcf9c776a0d88edad3b6aab3c36b5;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 5ab988178..1b71538c8 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -60,7 +60,9 @@
target.target,
path.path,
timer.timer,
- snapshot.snapshot
+ snapshot.snapshot,
+ slice.slice,
+ scope.scope/etc/systemd/system/*/run/systemd/system/*
@@ -81,12 +83,15 @@
A unit configuration file encodes information
about a service, a socket, a device, a mount point, an
automount point, a swap file or partition, a start-up
- target, a file system path, or a timer controlled and
- supervised by
- systemd1. The
- syntax is inspired by systemd1,
+ a temporary system state snapshot, a resource
+ management slice or a group of externally created
+ processes. The syntax is inspired by XDG
- Desktop Entry Specification.desktop files, which are in turn
+ Desktop Entry Specification
+ .desktop files, which are in turn
inspired by Microsoft Windows
.ini files.
@@ -110,6 +115,8 @@
systemd.path5,
systemd.timer5,
systemd.snapshot5.
+ systemd.slice5.
+ systemd.scope5.
Unit files are loaded from a set of paths
@@ -173,7 +180,7 @@
Along with a unit file
foo.service a directory
foo.service.d/ may exist. All
- files with the suffix .conf from
+ files with the suffix .conf from
this directory will be parsed after the file itself is
parsed. This is useful to alter or add configuration
settings to a unit, without having to modify their
@@ -182,7 +189,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 +202,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
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 +221,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
@@ -285,7 +292,7 @@
Local configuration
- /run/systemd/systemd
+ /run/systemd/systemVolatile units
@@ -310,7 +317,7 @@
- Load path when running in session mode ().
+ Load path when running in user mode ().
@@ -382,7 +389,7 @@
Documentation=
- A space separated list
+ A space-separated list
of URIs referencing documentation for
this unit or its
configuration. Accepted are only URIs
@@ -393,7 +400,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
@@ -405,7 +412,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.
@@ -646,7 +653,7 @@
Lists one or more
units that are activated when this
unit enters the
- 'failed'
+ failed
state.
@@ -669,8 +676,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
@@ -797,7 +804,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.
@@ -812,7 +819,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
@@ -871,7 +878,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.
@@ -940,7 +947,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
@@ -969,6 +976,7 @@
xen,
bochs,
chroot,
+ uml,
openvz,
lxc,
lxc-libvirt,
@@ -1007,11 +1015,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
@@ -1108,26 +1116,53 @@
time,
systemctl enable
will create symlinks from these names
- to the unit file name.
+ to the unit filename.
WantedBy=RequiredBy=
- Installs a symlink in
- the .wants/
- or .requires/
- subdirectory for a unit, respectively. This has the
- effect that when the listed unit name
- is activated the unit listing it is
- activated
- too. WantedBy=foo.service
+ A symbolic link is
+ created in the
+ .wants/ or
+ .requires/ directory
+ of the listed unit when this unit is
+ activated by systemctl
+ enable. This has the effect
+ that a dependency of type
+ Wants= or
+ Requires= is added
+ from the listed unit to the current
+ unit. The primary result is that the
+ current unit will be started when the
+ listed unit is started. See the
+ description of
+ Wants= and
+ Requires= in the
+ [Unit] section for details.
+
+ WantedBy=foo.service
in a service
bar.service is
mostly equivalent to
Alias=foo.service.wants/bar.service
- in the same file.
+ in the same file. In case of template
+ units, systemctl enable
+ must be called with an instance name, and
+ this instance will be added to the
+ .wants/ or
+ .requires/ list
+ of the listed unit.
+ E.g. WantedBy=getty.target
+ in a service
+ getty@.service
+ will result in systemctl
+ enable getty@tty2.service
+ creating a
+ getty.target.wants/getty@tty2.service
+ link to getty@.service.
+
@@ -1147,7 +1182,7 @@
The following specifiers are interpreted in the
- Install section: %n, %N, %p, %i, %U, %u, %m, %H, %b.
+ Install section: %n, %N, %p, %i, %U, %u, %m, %H, %b, %v.
For their meaning see the next section.
@@ -1198,7 +1233,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
@@ -1207,7 +1242,7 @@
%f
- Unescaped file name
+ Unescaped filenameThis is either the unescaped instance name (if applicable) with / prepended (if applicable), or the prefix name similarly prepended with /.
@@ -1263,7 +1298,12 @@
%HHost name
- The host name of the running system.
+ The hostname of the running system.
+
+
+ %v
+ Kernel release
+ Identical to uname -r output.%%
@@ -1291,9 +1331,12 @@
systemd.path5,
systemd.timer5,
systemd.snapshot5,
+ systemd.scope5,
+ systemd.slice5,
systemd.time7,
capabilities7,
- systemd.directives7
+ systemd.directives7,
+ uname1