X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=c8d9300d955dd2ef6053a0ab0b362cc962128d6b;hb=baccf3e40bab6c0b69992ae29c396930de4660c9;hp=be0873c344b6353441825eed83275080d0d6d3ba;hpb=f1e4d93f573087655ab1d0adb725102d5d2c1960;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index be0873c34..c8d9300d9 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -74,6 +74,8 @@
$HOME/.config/systemd/user/*/etc/systemd/user/*/run/systemd/user/*
+$XDG_DATA_HOME/systemd/user/*
+$HOME/.local/share/systemd/user/*/usr/lib/systemd/user/*...
@@ -201,7 +203,12 @@
settings to a unit, without having to modify their
unit files. Make sure that the file that is included
has the appropriate section headers before any
- directive.
+ directive. Note that for instanced units this logic
+ will first look for the instance
+ .d/ subdirectory and read its
+ .conf files, followed by the
+ template .d/ subdirectory and reads
+ its .conf files.
Note that while systemd offers a flexible
dependency system between units it is recommended to
@@ -273,8 +280,10 @@
() and the variable
$SYSTEMD_UNIT_PATH is set, this
contents of this variable overrides the unit load
- path.
-
+ path. If $SYSTEMD_UNIT_PATH ends
+ with an empty component (:), the
+ usual unit load path will be appended to the contents
+ of the variable.
@@ -338,9 +347,17 @@
/run/systemd/userRuntime units
+
+ $XDG_DATA_HOME/systemd/user
+ Units of packages that have been installed in the home directory (only used when $XDG_DATA_HOME is set)
+
+
+ $HOME/.local/share/systemd/user
+ Units of packages that have been installed in the home directory (only used when $XDG_DATA_HOME is not set)
+ /usr/lib/systemd/user
- Units of installed packages
+ Units of packages that have been installed system-wide
@@ -396,7 +413,7 @@
man:. For more
information about the syntax of these
URIs, see
- uri7. The
+ uri7. The
URIs should be listed in order of
relevance, starting with the most
relevant. It is a good idea to first
@@ -901,6 +918,7 @@
ConditionCapability=ConditionACPower=ConditionNeedsUpdate=
+ ConditionFirstBoot=ConditionPathExists=ConditionPathExistsGlob=ConditionPathIsDirectory=
@@ -985,12 +1003,12 @@
virtualization solution, or one of
qemu,
kvm,
+ zvm,
vmware,
microsoft,
oracle,
xen,
bochs,
- chroot,
uml,
openvz,
lxc,
@@ -1052,7 +1070,7 @@
(i.e. this does not check whether
capability is actually available in
the permitted or effective sets, see
- capabilities7
+ capabilities7
for details). Pass a capability name
such as CAP_MKNOD,
possibly prefixed with an exclamation
@@ -1102,6 +1120,18 @@
files's modification time gets reset
indicating a completed update.
+ ConditionFirstBoot=
+ takes a boolean argument. This
+ condition may be used to
+ conditionalize units on whether the
+ system is booting up with an
+ unpopulated /etc
+ directory. This may be used to
+ populate /etc on
+ the first boot after factory reset, or
+ when a new system instances boots up
+ for the first time.
+
With
ConditionPathExists=
a file existence condition is
@@ -1488,7 +1518,8 @@
systemd.scope5,
systemd.slice5,
systemd.time7,
- capabilities7,
+ systemd-verify1,
+ capabilities7,
systemd.directives7,
uname1