X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=1cfdac9267ef535216dbefc53f403bacb27aeb10;hb=1e158d273bb63883566358cbb886cd4167421df6;hp=68f02fcb6cdf56a5a8d06374d5cfadf0268bfd58;hpb=00d1818bb7fbc01086cc956fdb1fcbc8fb90482b;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 68f02fcb6..1cfdac926 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -195,9 +195,9 @@
in a both simpler and more flexible system.
Some unit names reflect paths existing in the
- file system name space. Example: a device unit
+ file system namespace. Example: a device unit
dev-sda.device refers to a device
- with the device node /dev/sda in
+ with the device node /dev/sda in
the file system namespace. If this applies a special
way to escape the path name is used, so that the
result is usable as part of a file name. Basically,
@@ -646,7 +646,7 @@
Lists one or more
units that are activated when this
unit enters the
- 'failed'
+ failed
state.
@@ -812,7 +812,7 @@
time. If this time limit is reached
the job will be cancelled, the unit
however will not change state or even
- enter the 'failed'
+ enter the failed
mode. This value defaults to 0 (job
timeouts disabled), except for device
units. NB: this timeout is independent
@@ -871,7 +871,7 @@
to
ConditionPathExists=
is prefixed with an exclamation mark
- ('!'), the test is negated, and the unit
+ (!), the test is negated, and the unit
is only started if the path does not
exist.
@@ -940,7 +940,7 @@
exclamation mark unset). The argument
must either be a single word, or an
assignment (i.e. two words, separated
- '='). In the former
+ =). In the former
case the kernel command line is
searched for the word appearing as is,
or as left hand side of an
@@ -983,8 +983,11 @@
ConditionSecurity=
may be used to check whether the given
security module is enabled on the
- system. Currently the only recognized
- value is selinux.
+ system. Currently the recognized values
+ values are selinux,
+ apparmor,
+ ima and
+ smack.
The test may be negated by prepending
an exclamation
mark.
@@ -1131,13 +1134,14 @@
Also=
Additional units to
- install when this unit is
- installed. If the user requests
- installation of a unit with this
- option configured,
+ install/deinstall when this unit is
+ installed/deinstalled. If the user
+ requests installation/deinstallation
+ of a unit with this option configured,
systemctl enable
- will automatically install units
- listed in this option as
+ and systemctl
+ disable will automatically
+ install/uninstall units listed in this option as
well.
@@ -1204,7 +1208,7 @@
%f
Unescaped file name
- This is either the unescaped instance name (if applicable) with / prepended (if applicable), or the prefix name similarly prepended with /.
+ This is either the unescaped instance name (if applicable) with / prepended (if applicable), or the prefix name similarly prepended with /.
%c
@@ -1213,13 +1217,13 @@
%r
- Root control group path of systemd
-
+ Root control group path where units are placed.
+ For system instances this usually resolves to /system, except in containers, where the path might be prefixed with the container's root control group.
%R
- Parent directory of the root control group path of systemd
-
+ Parent directory of the control group path where units are placed.
+ For system instances this usually resolves to /, except in containers, where this resolves to the container's root directory. This specifier is particularly useful in the ControlGroup= setting (see systemd.exec5).
%t
@@ -1244,14 +1248,7 @@
%s
User shell
- This is the shell of the configured
- user of the unit, or (if none is set) the user
- running the systemd instance. If the user is
- root (UID equal to 0), the
- shell configured in account database is
- ignored and /bin/sh is
- always used.
-
+ This is the shell of the configured user of the unit, or (if none is set) the user running the systemd instance. If the user is root (UID equal to 0), the shell configured in account database is ignored and /bin/sh is always used.
%m