summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-09-23 04:38:39 +0200
committerLennart Poettering <lennart@poettering.net>2011-09-23 16:28:27 +0200
commit65bc2c21140d20e757b0aed9bb23286939426abb (patch)
treeea1be9f787323ba98113382965745e31c51c17f4 /man
parent3bb1c6b04f93841c10d2cb1c4e2945d5a0bb8ff1 (diff)
util: detect systemd-nspawn without relying on ns cgroup tree
Diffstat (limited to 'man')
-rw-r--r--man/systemd.unit.xml19
1 files changed, 12 insertions, 7 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index f4764f9557..9066e66cc2 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -746,18 +746,22 @@
whether it is a specific
implementation. Takes either boolean
value to check if being executed in
- any virtual environment or one of the
+ any virtual environment or one of
<varname>qemu</varname>,
<varname>kvm</varname>,
<varname>vmware</varname>,
<varname>microsoft</varname>,
<varname>oracle</varname>,
<varname>xen</varname>,
- <varname>pidns</varname>,
- <varname>openvz</varname> to test
- against a specific implementation. The
- test may be negated by prepending an
- exclamation mark.
+ <varname>openvz</varname>,
+ <varname>lxc</varname>,
+ <varname>systemd-nspawn</varname>,
+ <varname>pidns</varname> to test
+ against a specific implementation. If
+ multiple virtualization technologies
+ are nested only the innermost is
+ considered. The test may be negated by
+ prepending an exclamation mark.
<varname>ConditionSecurity=</varname>
may be used to check whether the given
security module is enabled on the
@@ -788,7 +792,8 @@
pipe symbol must be passed first, the
exclamation second. Except for
<varname>ConditionPathIsSymbolicLink=</varname>,
- all path checks follow symlinks.</para></listitem>
+ all path checks follow
+ symlinks.</para></listitem>
</varlistentry>
<varlistentry>