chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keymap: Apply to all Latitude and Precision models
[elogind.git]
/
man
/
systemd.unit.xml
diff --git
a/man/systemd.unit.xml
b/man/systemd.unit.xml
index f924ef69dd3149e64f67c9451a62b270aed9ed8d..6a5eefb6dbd09e34d66563caec1a28139f6a50c6 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,
@@
-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>