summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorBalint Reczey <balint.reczey@canonical.com>2019-03-06 18:46:04 +0100
committerLennart Poettering <lennart@poettering.net>2019-03-13 18:42:27 +0100
commit6c8a2c679313f8283514923daf65f5e9d050d94c (patch)
tree5999e814ee4eaa5a08bdeff93dcd031cf613981d /man
parentef9fafbd9143a1d6278f65ce857735ad08c79f66 (diff)
downloadsystemd-6c8a2c679313f8283514923daf65f5e9d050d94c.tar.gz
virt: detect WSL environment as a container (id: wsl)
Diffstat (limited to 'man')
-rw-r--r--man/systemd-detect-virt.xml13
-rw-r--r--man/systemd.unit.xml1
2 files changed, 13 insertions, 1 deletions
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 5c5510eaf2..1f5270dbb2 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -131,7 +131,7 @@
</row>
<row>
- <entry valign="top" morerows="5">Container</entry>
+ <entry valign="top" morerows="6">Container</entry>
<entry><varname>openvz</varname></entry>
<entry>OpenVZ/Virtuozzo</entry>
</row>
@@ -160,6 +160,11 @@
<entry><varname>rkt</varname></entry>
<entry>rkt app container runtime</entry>
</row>
+
+ <row>
+ <entry><varname>wsl</varname></entry>
+ <entry><ulink url="https://docs.microsoft.com/en-us/windows/wsl/about">Windows Subsystem for Linux</ulink></entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -169,6 +174,12 @@
machine and container virtualization are used in
conjunction, only the latter will be identified (unless
<option>--vm</option> is passed).</para>
+ <para> Windows Subsystem for Linux is not a Linux container,
+ but an environment for running Linux userspace applications on
+ top of the Windows kernel using a Linux-compatible interface.
+ WSL is categorized as a container for practical purposes.
+ Multiple WSL environments share the same kernel and services
+ should generally behave like when being run in a container.</para>
</refsect1>
<refsect1>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 14418c359f..93b576d539 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1089,6 +1089,7 @@
<varname>systemd-nspawn</varname>,
<varname>docker</varname>,
<varname>rkt</varname>,
+ <varname>wsl</varname>,
<varname>acrn</varname> to test
against a specific implementation, or
<varname>private-users</varname> to check whether we are running in a user namespace. See