X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=2b59b1b841c64b3c2c5d9d870c68ef12b5ea73e8;hp=02445703617bbf962ed29d4e26e7510597ee8cda;hb=099524d7b0df690e3361ffc3fe3c6aed0558b4fc;hpb=b040723ea412209e0edf54647fa5aa4287411507
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 024457036..2b59b1b84 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -232,7 +232,7 @@
multiple units from a single configuration file. If
systemd looks for a unit configuration file, it will
first search for the literal unit name in the
- filesystem. If that yields no success and the unit
+ file system. If that yields no success and the unit
name contains an @ character, systemd will look for a
unit template that shares the same name but with the
instance string (i.e. the part between the @ character
@@ -548,7 +548,7 @@
of units. When systemd stops or restarts
the units listed here, the action is
propagated to this unit.
- Note that this is a one way dependency â
+ Note that this is a one-way dependency â
changes to this unit do not affect the
listed units.
@@ -879,6 +879,13 @@
+ ConditionArchitecture=
+ ConditionVirtualization=
+ ConditionHost=
+ ConditionKernelCommandLine=
+ ConditionSecurity=
+ ConditionCapability=
+ ConditionACPower=
ConditionPathExists=
ConditionPathExistsGlob=
ConditionPathIsDirectory=
@@ -888,12 +895,6 @@
ConditionDirectoryNotEmpty=
ConditionFileNotEmpty=
ConditionFileIsExecutable=
- ConditionKernelCommandLine=
- ConditionVirtualization=
- ConditionSecurity=
- ConditionCapability=
- ConditionHost=
- ConditionACPower=
ConditionNull=
Before starting a unit
@@ -908,93 +909,46 @@
queued start job is to be
executed.
- With
- ConditionPathExists=
- a file existence condition is
- checked before a unit is started. If
- the specified absolute path name does
- not exist, the condition will
- fail. If the absolute path name passed
- to
- ConditionPathExists=
- is prefixed with an exclamation mark
- (!), the test is negated, and the unit
- is only started if the path does not
- exist.
-
- ConditionPathExistsGlob=
- is similar to
- ConditionPathExists=,
- but checks for the existence of at
- least one file or directory matching
- the specified globbing pattern.
-
- ConditionPathIsDirectory=
- is similar to
- ConditionPathExists=
- but verifies whether a certain path
- exists and is a
- directory.
-
- ConditionPathIsSymbolicLink=
- is similar to
- ConditionPathExists=
- but verifies whether a certain path
- exists and is a symbolic
- link.
-
- ConditionPathIsMountPoint=
- is similar to
- ConditionPathExists=
- but verifies whether a certain path
- exists and is a mount
- point.
-
- ConditionPathIsReadWrite=
- is similar to
- ConditionPathExists=
- but verifies whether the underlying
- file system is readable and writable
- (i.e. not mounted
- read-only).
-
- ConditionDirectoryNotEmpty=
- is similar to
- ConditionPathExists=
- but verifies whether a certain path
- exists and is a non-empty
- directory.
-
- ConditionFileNotEmpty=
- is similar to
- ConditionPathExists=
- but verifies whether a certain path
- exists and refers to a regular file
- with a non-zero size.
-
- ConditionFileIsExecutable=
- is similar to
- ConditionPathExists=
- but verifies whether a certain path
- exists, is a regular file and marked
- executable.
-
- Similarly,
- ConditionKernelCommandLine=
- may be used to check whether a
- specific kernel command line option is
- set (or if prefixed with the
- exclamation mark unset). The argument
- must either be a single word, or an
- assignment (i.e. two words, separated
- =). In the former
- 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
- exact assignment is looked for with
- right and left hand side
- matching.
+ ConditionArchitecture=
+ may be used to check whether the
+ system is running on a specific
+ architecture. Takes one of
+ x86,
+ x86-64,
+ ppc,
+ ppc64,
+ ia64,
+ parisc,
+ parisc64,
+ s390,
+ s390x,
+ sparc,
+ sparc64,
+ mips,
+ mips64,
+ alpha,
+ arm,
+ arm-be,
+ arm64,
+ arm64-be,
+ sh,
+ sh64,
+ m86k to test
+ against a specific architecture. The
+ architecture is determined from the
+ information returned by
+ uname2
+ and is thus subject to
+ personality2. Note
+ that a Personality=
+ setting in the same unit file has no
+ effect on this condition. A special
+ architecture name
+ native is mapped to
+ the architecture the system manager
+ itself is compiled for. The test may
+ be negated by prepending an
+ exclamation mark.
ConditionVirtualization=
may be used to check whether the
@@ -1028,6 +982,36 @@
test may be negated by prepending an
exclamation mark.
+ ConditionHost=
+ may be used to match against the
+ hostname or machine ID of the
+ host. This either takes a hostname
+ string (optionally with shell style
+ globs) which is tested against the
+ locally set hostname as returned by
+ gethostname2,
+ or a machine ID formatted as string
+ (see
+ machine-id5).
+ The test may be negated by prepending
+ an exclamation mark.
+
+ ConditionKernelCommandLine=
+ may be used to check whether a
+ specific kernel command line option is
+ set (or if prefixed with the
+ exclamation mark unset). The argument
+ must either be a single word, or an
+ assignment (i.e. two words, separated
+ =). In the former
+ 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
+ exact assignment is looked for with
+ right and left hand side
+ matching.
+
ConditionSecurity=
may be used to check whether the given
security module is enabled on the
@@ -1053,20 +1037,6 @@
possibly prefixed with an exclamation
mark to negate the check.
- ConditionHost=
- may be used to match against the
- hostname or machine ID of the
- host. This either takes a hostname
- string (optionally with shell style
- globs) which is tested against the
- locally set hostname as returned by
- gethostname2,
- or a machine ID formatted as string
- (see
- machine-id5).
- The test may be negated by prepending
- an exclamation mark.
-
ConditionACPower=
may be used to check whether the
system has AC power, or is exclusively
@@ -1084,6 +1054,77 @@
all AC connectors are disconnected
from a power source.
+ With
+ ConditionPathExists=
+ a file existence condition is
+ checked before a unit is started. If
+ the specified absolute path name does
+ not exist, the condition will
+ fail. If the absolute path name passed
+ to
+ ConditionPathExists=
+ is prefixed with an exclamation mark
+ (!), the test is negated, and the unit
+ is only started if the path does not
+ exist.
+
+ ConditionPathExistsGlob=
+ is similar to
+ ConditionPathExists=,
+ but checks for the existence of at
+ least one file or directory matching
+ the specified globbing pattern.
+
+ ConditionPathIsDirectory=
+ is similar to
+ ConditionPathExists=
+ but verifies whether a certain path
+ exists and is a
+ directory.
+
+ ConditionPathIsSymbolicLink=
+ is similar to
+ ConditionPathExists=
+ but verifies whether a certain path
+ exists and is a symbolic
+ link.
+
+ ConditionPathIsMountPoint=
+ is similar to
+ ConditionPathExists=
+ but verifies whether a certain path
+ exists and is a mount
+ point.
+
+ ConditionPathIsReadWrite=
+ is similar to
+ ConditionPathExists=
+ but verifies whether the underlying
+ file system is readable and writable
+ (i.e. not mounted
+ read-only).
+
+ ConditionDirectoryNotEmpty=
+ is similar to
+ ConditionPathExists=
+ but verifies whether a certain path
+ exists and is a non-empty
+ directory.
+
+ ConditionFileNotEmpty=
+ is similar to
+ ConditionPathExists=
+ but verifies whether a certain path
+ exists and refers to a regular file
+ with a non-zero size.
+
+ ConditionFileIsExecutable=
+ is similar to
+ ConditionPathExists=
+ but verifies whether a certain path
+ exists, is a regular file and marked
+ executable.
+
Finally,
ConditionNull= may
be used to add a constant condition