X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=61be6d224f5ad5e7a5ed6cbb8c59aff044eeacb3;hb=f56506141cbf6391b0373108a2522ba771b25f4b;hp=bcd4ba8ee5605ac913c2ffb185708738c8754c74;hpb=05a2f6fefedd7254fd799502191d025d2908cf74;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index bcd4ba8ee..61be6d224 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -139,10 +139,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
@@ -705,13 +707,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).
+
@@ -1006,7 +1021,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.
@@ -1166,7 +1181,7 @@
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.
@@ -1271,6 +1286,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