X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=c8d9300d955dd2ef6053a0ab0b362cc962128d6b;hp=2b59b1b841c64b3c2c5d9d870c68ef12b5ea73e8;hb=6192b846ca0d15602e94ddb5da4420b7c60d64a5;hpb=099524d7b0df690e3361ffc3fe3c6aed0558b4fc
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 2b59b1b84..c8d9300d9 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -70,9 +70,12 @@
...
- $HOME/.config/systemd/user/*
+ $XDG_CONFIG_HOME/systemd/user/*
+$HOME/.config/systemd/user/*/etc/systemd/user/*/run/systemd/user/*
+$XDG_DATA_HOME/systemd/user/*
+$HOME/.local/share/systemd/user/*/usr/lib/systemd/user/*...
@@ -138,10 +141,12 @@
Unit files may contain additional options on top
of those listed here. If systemd encounters an unknown
option, it will write a warning log message but
- continue loading the unit. If an option is prefixed
- with , it is ignored completely by
- systemd. Applications may use this to include
- additional information in the unit files.
+ continue loading the unit. If an option or section name
+ is prefixed with , it is ignored
+ completely by systemd. Options within an ignored
+ section do not need the prefix. Applications may use
+ this to include additional information in the unit
+ files.Boolean arguments used in unit files can be
written in various formats. For positive settings the
@@ -198,13 +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.
-
- If a line starts with
- 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.
+ 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
@@ -276,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.
@@ -325,9 +331,13 @@
</row>
</thead>
<tbody>
+ <row>
+ <entry><filename>$XDG_CONFIG_HOME/systemd/user</filename></entry>
+ <entry>User configuration (only used when $XDG_CONFIG_HOME is set)</entry>
+ </row>
<row>
<entry><filename>$HOME/.config/systemd/user</filename></entry>
- <entry>User configuration</entry>
+ <entry>User configuration (only used when $XDG_CONFIG_HOME is not set)</entry>
</row>
<row>
<entry><filename>/etc/systemd/user</filename></entry>
@@ -337,9 +347,17 @@
<entry><filename>/run/systemd/user</filename></entry>
<entry>Runtime units</entry>
</row>
+ <row>
+ <entry><filename>$XDG_DATA_HOME/systemd/user</filename></entry>
+ <entry>Units of packages that have been installed in the home directory (only used when $XDG_DATA_HOME is set)</entry>
+ </row>
+ <row>
+ <entry><filename>$HOME/.local/share/systemd/user</filename></entry>
+ <entry>Units of packages that have been installed in the home directory (only used when $XDG_DATA_HOME is not set)</entry>
+ </row>
<row>
<entry><filename>/usr/lib/systemd/user</filename></entry>
- <entry>Units of installed packages</entry>
+ <entry>Units of packages that have been installed system-wide</entry>
</row>
</tbody>
</tgroup>
@@ -356,7 +374,7 @@
</refsect1>
<refsect1>
- <title>Options
+ [Unit] Section OptionsUnit file may include a [Unit] section, which
carries generic information about the unit that is not
@@ -395,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
@@ -706,13 +724,26 @@
RequiresMountsFor=
- Takes a space-separated
- list of absolute paths. Automatically
- adds dependencies of type
- Requires= and
- After= for all
+ Takes a
+ space-separated list of absolute
+ paths. Automatically adds dependencies
+ of type Requires=
+ and After= for all
mount units required to access the
- specified path.
+ specified path.
+
+ Mount points marked with
+ are not
+ mounted automatically and will be
+ ignored for the purposes of this
+ option. If such a mount should be a
+ requirement for this unit,
+ direct dependencies on the mount
+ units may be added
+ (Requires= and
+ After= or
+ some other combination).
+
@@ -886,6 +917,8 @@
ConditionSecurity=ConditionCapability=ConditionACPower=
+ ConditionNeedsUpdate=
+ ConditionFirstBoot=ConditionPathExists=ConditionPathExistsGlob=ConditionPathIsDirectory=
@@ -916,7 +949,9 @@
x86,
x86-64,
ppc,
+ ppc-le,
ppc64,
+ ppc64-le,
ia64,
parisc,
parisc64,
@@ -925,7 +960,9 @@
sparc,
sparc64,
mips,
+ mips-le,
mips64,
+ mips64-le,
alpha,
arm,
arm-be,
@@ -933,7 +970,9 @@
arm64-be,
sh,
sh64,
- m86k to test
+ m86k,
+ tilegx,
+ cris to test
against a specific architecture. The
architecture is determined from the
information returned by
@@ -964,12 +1003,12 @@
virtualization solution, or one of
qemu,
kvm,
+ zvm,
vmware,
microsoft,
oracle,
xen,
bochs,
- chroot,
uml,
openvz,
lxc,
@@ -1007,7 +1046,7 @@
case the kernel command line is
searched for the word appearing as is,
or as left hand side of an
- assignment. In the latter case the
+ assignment. In the latter case, the
exact assignment is looked for with
right and left hand side
matching.
@@ -1031,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
@@ -1054,6 +1093,45 @@
all AC connectors are disconnected
from a power source.
+ ConditionNeedsUpdate=
+ takes one of /var
+ or /etc as
+ argument, possibly prefixed with a
+ ! (for inverting
+ the condition). This condition may be
+ used to conditionalize units on
+ whether the specified directory
+ requires an update because
+ /usr's
+ modification time is newer than the
+ stamp file
+ .updated in the
+ specified directory. This is useful to
+ implement offline updates of the
+ vendor operating system resources in
+ /usr that require
+ updating of /etc
+ or /var on the
+ next following boot. Units making use
+ of this condition should order
+ themselves before
+ systemd-update-done.service8,
+ to make sure they run before the stamp
+ 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
@@ -1167,12 +1245,17 @@
useful for implementation of generator
tools that convert configuration from
an external configuration file format
- into native unit files. Thus
+ into native unit files. This
functionality should not be used in
normal units.
+
+
+
+ [Install] Section Options
+
Unit file may include a [Install] section, which
carries installation information for the unit. This
section is not interpreted by
@@ -1267,6 +1350,19 @@
of unit names may be
given.
+
+
+ DefaultInstance=
+
+ In template unit files,
+ this specifies for which instance the
+ unit shall be enabled if the template
+ is enabled without any explicitly set
+ instance. This option has no effect in
+ non-template unit files. The specified
+ string must be usable as instance
+ identifier.
+ The following specifiers are interpreted in the
@@ -1422,7 +1518,8 @@
systemd.scope5,
systemd.slice5,
systemd.time7,
- capabilities7,
+ systemd-verify1,
+ capabilities7,
systemd.directives7,
uname1