chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: use <constant> for various constants which look ugly with quotes
[elogind.git]
/
man
/
systemd.unit.xml
diff --git
a/man/systemd.unit.xml
b/man/systemd.unit.xml
index f924ef69dd3149e64f67c9451a62b270aed9ed8d..1cfdac9267ef535216dbefc53f403bacb27aeb10 100644
(file)
--- a/
man/systemd.unit.xml
+++ b/
man/systemd.unit.xml
@@
-195,9
+195,9
@@
in a both simpler and more flexible system.</para>
<para>Some unit names reflect paths existing in the
in a both simpler and more flexible system.</para>
<para>Some unit names reflect paths existing in the
- file system name
space. Example: a device unit
+ file system namespace. Example: a device unit
<filename>dev-sda.device</filename> refers to a device
<filename>dev-sda.device</filename> refers to a device
- with the device node <filename>/dev/sda</filename> in
+ with the device node <filename
noindex='true'
>/dev/sda</filename> 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,
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
@@
<listitem><para>Lists one or more
units that are activated when this
unit enters the
<listitem><para>Lists one or more
units that are activated when this
unit enters the
- '<literal>failed</literal>'
+ <literal>failed</literal>
state.</para></listitem>
</varlistentry>
state.</para></listitem>
</varlistentry>
@@
-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
time. If this time limit is reached
the job will be cancelled, the unit
however will not change state or even
- enter the
'<literal>failed</literal>'
+ enter the
<literal>failed</literal>
mode. This value defaults to 0 (job
timeouts disabled), except for device
units. NB: this timeout is independent
mode. This value defaults to 0 (job
timeouts disabled), except for device
units. NB: this timeout is independent
@@
-871,7
+871,7
@@
to
<varname>ConditionPathExists=</varname>
is prefixed with an exclamation mark
to
<varname>ConditionPathExists=</varname>
is prefixed with an exclamation mark
- (
'!'
), the test is negated, and the unit
+ (
<literal>!</literal>
), the test is negated, and the unit
is only started if the path does not
exist.</para>
is only started if the path does not
exist.</para>
@@
-940,7
+940,7
@@
exclamation mark unset). The argument
must either be a single word, or an
assignment (i.e. two words, separated
exclamation mark unset). The argument
must either be a single word, or an
assignment (i.e. two words, separated
-
'='
). In the former
+
<literal>=</literal>
). In the former
case the kernel command line is
searched for the word appearing as is,
or as left hand side of an
case the kernel command line is
searched for the word appearing as is,
or as left hand side of an
@@
-983,8
+983,11
@@
<para><varname>ConditionSecurity=</varname>
may be used to check whether the given
security module is enabled on the
<para><varname>ConditionSecurity=</varname>
may be used to check whether the given
security module is enabled on the
- system. Currently the only recognized
- value is <varname>selinux</varname>.
+ system. Currently the recognized values
+ values are <varname>selinux</varname>,
+ <varname>apparmor</varname>,
+ <varname>ima</varname> and
+ <varname>smack</varname>.
The test may be negated by prepending
an exclamation
mark.</para>
The test may be negated by prepending
an exclamation
mark.</para>
@@
-1131,13
+1134,14
@@
<term><varname>Also=</varname></term>
<listitem><para>Additional units to
<term><varname>Also=</varname></term>
<listitem><para>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
+ o
f a unit with this o
ption configured,
<command>systemctl enable</command>
<command>systemctl enable</command>
- will automatically install units
- listed in this option as
+ and <command>systemctl
+ disable</command> will automatically
+ install/uninstall units listed in this option as
well.</para></listitem>
</varlistentry>
</variablelist>
well.</para></listitem>
</varlistentry>
</variablelist>