diff options
author | Lennart Poettering <lennart@poettering.net> | 2019-02-28 18:56:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-28 18:56:48 +0100 |
commit | 737e2f306e2fe162d9b0948943b8c64713ee0788 (patch) | |
tree | 3c1538e69a1b8613186da972537fc5066e0e9e70 /man | |
parent | 2fe4c28d3068ea92da3b384e5a660757fbb4964b (diff) | |
parent | 0f0e30ad9cc8be1140fc43436c71549c2eafeac9 (diff) | |
download | systemd-737e2f306e2fe162d9b0948943b8c64713ee0788.tar.gz systemd-737e2f306e2fe162d9b0948943b8c64713ee0788.tar.bz2 systemd-737e2f306e2fe162d9b0948943b8c64713ee0788.zip |
Merge pull request #11857 from rossburton/acrn
virt: detect the ACRN hypervisor
Diffstat (limited to 'man')
-rw-r--r-- | man/systemd-detect-virt.xml | 5 | ||||
-rw-r--r-- | man/systemd.unit.xml | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml index e4c2d9fd5f..5c5510eaf2 100644 --- a/man/systemd-detect-virt.xml +++ b/man/systemd-detect-virt.xml @@ -126,6 +126,11 @@ </row> <row> + <entry><varname>acrn</varname></entry> + <entry><ulink url="https://projectacrn.org">ACRN hypervisor</ulink></entry> + </row> + + <row> <entry valign="top" morerows="5">Container</entry> <entry><varname>openvz</varname></entry> <entry>OpenVZ/Virtuozzo</entry> diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index f21f9eae44..82c63e1609 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -1093,7 +1093,8 @@ <varname>lxc-libvirt</varname>, <varname>systemd-nspawn</varname>, <varname>docker</varname>, - <varname>rkt</varname> to test + <varname>rkt</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 <citerefentry><refentrytitle>systemd-detect-virt</refentrytitle><manvolnum>1</manvolnum></citerefentry> |