X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=afad56c5b2ef4bc1429423517093620a2c06be65;hb=15119c160268ce4ba9da4be67ed8adc412220b7d;hp=bf22ca9bd0fdfe584b3f768f88476002bf3c0637;hpb=c0d6e764d107a81a6439c41edbe92790623ed7de;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index bf22ca9bd..afad56c5b 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -77,8 +77,8 @@
This man pages lists the common configuration
options of all the unit types. These options need to
- be configured in the [Unit] resp. [Install]
- section of the unit files.
+ be configured in the [Unit] or [Install]
+ sections of the unit files.
In addition to the generic [Unit] and [Install]
sections described here, each unit should have a
@@ -273,6 +273,21 @@
User shellThis is the shell of the configured user of the unit, or (if none is set) the user running the systemd instance.
+
+ %m
+ Machine ID
+ The machine ID of the running system, formatted as string. See machine-id5 for more information.
+
+
+ %b
+ Boot ID
+ The boot ID of the running system, formatted as string. See random4 for more information.
+
+
+ %H
+ Host name
+ The host name of the running system.
+
@@ -403,7 +418,7 @@
Similar to
Requires=
- resp. RequiresOverridable=. However,
+ and RequiresOverridable=, respectively. However,
if a unit listed here is not started
already it will not be started and the
transaction fails
@@ -440,7 +455,7 @@
Configures requirement
dependencies, very similar in style to
Requires=, however
- in addition to this behaviour it also
+ in addition to this behavior it also
declares that this unit is stopped
when any of the units listed suddenly
disappears. Units can suddenly,
@@ -551,7 +566,7 @@
Before=. If two
units have no ordering dependencies
between them they are shut down
- resp. started up simultaneously, and
+ or started up simultaneously, and
no ordering takes
place.
@@ -657,13 +672,13 @@
Takes a boolean
argument. If
this unit can only be activated
- (resp. deactivated) indirectly. In
+ or deactivated indirectly. In
this case explicit start-up
- (resp. termination) requested by the
+ or termination requested by the
user is denied, however if it is
- started (resp. stopped) as a
+ started or stopped as a
dependency of another unit, start-up
- (resp. termination) will succeed. This
+ or termination will succeed. This
is mostly a safety feature to ensure
that the user does not accidentally
activate units that are not intended
@@ -755,6 +770,7 @@
ConditionPathIsMountPoint=ConditionPathIsReadWrite=ConditionDirectoryNotEmpty=
+ ConditionFileNotEmpty=ConditionFileIsExecutable=ConditionKernelCommandLine=ConditionVirtualization=
@@ -825,21 +841,28 @@
(i.e. not mounted
read-only).
- ConditionFileIsExecutable=
+ ConditionDirectoryNotEmpty=
is similar to
ConditionPathExists=
but verifies whether a certain path
- exists, is a regular file and marked
- executable.
+ exists and is a non-empty
+ directory.
- ConditionDirectoryNotEmpty=
+ ConditionFileNotEmpty=
is similar to
ConditionPathExists=
but verifies whether a certain path
- exists and is a non-empty
- directory.
+ 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,
+ Similar,
ConditionKernelCommandLine=
may be used to check whether a
specific kernel command line option is
@@ -1000,8 +1023,8 @@
Installs a symlink in
the .wants/
- resp. .requires/
- subdirectory for a unit. This has the
+ or .requires/
+ subdirectory for a unit, respectively. This has the
effect that when the listed unit name
is activated the unit listing it is
activated