X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=17141576d052e9fea76e1f977d0252d72bdddd1c;hb=404dac4d96f4aaf66026e8b412c4b67e8773cffa;hp=2f65ec6dacfb1d400311da2bf0f5a79d12b3f964;hpb=6f88df575181d029eadc889fd6891dee22016af1;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 2f65ec6da..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
@@ -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/system
- Volatile units
-
-
- /run/systemd/generator
- Generated units (middle)
-
-
- /usr/local/lib/systemd/system
- Units for local packages
+ 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).
@@ -1324,6 +1314,8 @@
systemd.path5,
systemd.timer5,
systemd.snapshot5,
+ systemd.scope5,
+ systemd.slice5,
systemd.time7,
capabilities7,
systemd.directives7,