X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=17141576d052e9fea76e1f977d0252d72bdddd1c;hp=4f0bd64b121728c488e8ba1747f39348d55b5206;hb=693093c6db9d8510729b7566e74182b4ff50e31c;hpb=409dee2e44e7dc73d6bf00d782938e4cb4105f5b
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 4f0bd64b1..17141576d 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/*
@@ -68,7 +70,8 @@
...
- /etc/systemd/user/*
+ $HOME/.config/systemd/user/*
+/etc/systemd/user/*/run/systemd/user/*/usr/lib/systemd/user/*...
@@ -81,12 +84,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 +116,8 @@
systemd.path5,
systemd.timer5,
systemd.snapshot5.
+ systemd.slice5.
+ systemd.scope5.
Unit files are loaded from a set of paths
@@ -173,7 +181,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
@@ -249,10 +257,9 @@
Unit files are loaded from a set of paths
determined during compilation, described in the two
- tables below. Unit files found in directories higher
- in the hierarchy override files with the same name
- lower in the hierarchy, thus allowing overrides.
-
+ tables below. Unit files found in directories listed
+ earlier override files with the same name in
+ directories lower in the list.When systemd is running in user mode
() and the variable
@@ -276,33 +283,17 @@
-
- /run/systemd/generator.early
- Generated units (early)
- /etc/systemd/systemLocal configuration
- /run/systemd/systemd
- Volatile units
-
-
- /run/systemd/generator
- Generated units (middle)
-
-
- /usr/local/lib/systemd/system
- Units for local packages
+ /run/systemd/system
+ Runtime units/usr/lib/systemd/system
- Units for installed packages
-
-
- /run/systemd/generator.late
- Generated units (late)
+ Units of installed packages
@@ -310,7 +301,7 @@
- Load path when running in session mode ().
+ Load path when running in user mode ().
@@ -324,8 +315,8 @@
- /tmp/systemd-generator.early.XXXXXX
- Generated units (early)
+ $HOME/.config/systemd/user
+ User configuration/etc/systemd/user
@@ -333,23 +324,11 @@
/run/systemd/user
- Volatile units
-
-
- /tmp/systemd-generator.XXXXXX
- Generated units (middle)
-
-
- /usr/local/lib/systemd/user
- Units for local packages
+ Runtime units/usr/lib/systemd/user
- Units for installed packages
-
-
- /tmp/systemd-generator.late.XXXXXX
- Generated units (late)
+ Units of installed packages
@@ -358,7 +337,10 @@
Additional units might be loaded into systemd
("linked") from directories not on the unit load
path. See the link command for
- systemctl1.
+ systemctl1. Also,
+ some units are dynamically created via generators
+ Generators.
@@ -377,7 +359,15 @@
describing the unit. This is intended
for use in UIs to show descriptive
information along with the unit
- name.
+ name. The description should contain a name
+ that means something to the end user.
+ Apache2 Web Server is a good
+ example. Bad examples are
+ high-performance light-weight HTTP
+ server (too generic) or
+ Apache2 (too specific and
+ meaningless for people who do not know
+ Apache).
@@ -969,6 +959,7 @@
xen,
bochs,
chroot,
+ uml,
openvz,
lxc,
lxc-libvirt,
@@ -1115,19 +1106,46 @@
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 +1165,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.
@@ -1265,6 +1283,11 @@
Host nameThe hostname of the running system.
+
+ %v
+ Kernel release
+ Identical to uname -r output.
+ %%Escaped %
@@ -1291,9 +1314,12 @@
systemd.path5,
systemd.timer5,
systemd.snapshot5,
+ systemd.scope5,
+ systemd.slice5,
systemd.time7,
capabilities7,
- systemd.directives7
+ systemd.directives7,
+ uname1