X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=55569681cf43164801073c55ed186b7cceccb3a5;hb=6569cae18ed640a4e9f52f73e2a3ec54b07d0406;hp=bf22ca9bd0fdfe584b3f768f88476002bf3c0637;hpb=c0d6e764d107a81a6439c41edbe92790623ed7de;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index bf22ca9bd..55569681c 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -273,6 +273,21 @@
User shell
This 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.
+
@@ -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,
@@ -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