[systemd-commits] 3 commits - man/systemd-detect-virt.xml man/systemd.unit.xml
Lennart Poettering
lennart at kemper.freedesktop.org
Fri Oct 10 03:37:26 PDT 2014
man/systemd-detect-virt.xml | 116 +++++++++++++++++++++++++++++++++++++++-----
man/systemd.unit.xml | 18 ++++--
2 files changed, 115 insertions(+), 19 deletions(-)
New commits:
commit e737ef153c41435f1ad42b51233eedfb279e2ff7
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Oct 10 12:37:21 2014 +0200
man: reference table in systemd-detect-virt(1) from ConditionVirtualization= documentation
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index ec7ca56..e9395ff 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1018,13 +1018,17 @@
<varname>openvz</varname>,
<varname>lxc</varname>,
<varname>lxc-libvirt</varname>,
- <varname>systemd-nspawn</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.</para>
+ <varname>systemd-nspawn</varname>,
+ <varname>docker</varname> to test
+ against a specific implementation. See
+ <citerefentry><refentrytitle>systemd-detect-virt</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ for a full list of known
+ virtualization technologies and their
+ identifiers. If multiple
+ virtualization technologies are
+ nested, only the innermost is
+ considered. The test may be negated by
+ prepending an exclamation mark.</para>
<para><varname>ConditionHost=</varname>
may be used to match against the
commit 26d32dc5ee6d288108001f3fb7d45e25be441e14
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Oct 10 12:36:57 2014 +0200
man: include zVM in systemd-detect-virt list
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index e167bdd..eed0fe0 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -69,7 +69,7 @@
are currently identified:</para>
<table>
- <title>Known VM virtualization technologies</title>
+ <title>Known VM virtualization technologies (i.e. full hardware virtualization)</title>
<tgroup cols='2' align='left' colsep='1' rowsep='1'>
<colspec colname="id" />
<colspec colname="product" />
@@ -84,12 +84,18 @@
<entry><varname>qemu</varname></entry>
<entry>QEMU software virtualization</entry>
</row>
+
<row>
<entry><varname>kvm</varname></entry>
<entry>Linux KVM kernel virtual machine</entry>
</row>
<row>
+ <entry><varname>zvm</varname></entry>
+ <entry>s390 z/VM</entry>
+ </row>
+
+ <row>
<entry><varname>vmware</varname></entry>
<entry>VMware Workstation or Server, and related products</entry>
</row>
@@ -106,7 +112,7 @@
<row>
<entry><varname>xen</varname></entry>
- <entry>Xen hypervisor</entry>
+ <entry>Xen hypervisor (only domU, not dom0)</entry>
</row>
<row>
@@ -124,7 +130,7 @@
</table>
<table>
- <title>Known container virtualization technologies</title>
+ <title>Known container virtualization technologies (i.e. shared kernel virtualization)</title>
<tgroup cols='2' align='left' colsep='1' rowsep='1'>
<colspec colname="id" />
<colspec colname="product" />
commit a9d9ad1fa7d528f49ecf9c971f840b5fe135119d
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Oct 10 12:29:08 2014 +0200
man: rework VM/container identifier list into a table, and include descriptions for all entries
(also remove chroot from the list, we don't detect that anymore)
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index d3969e1..e167bdd 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -66,17 +66,102 @@
<para>When executed without <option>--quiet</option>
will print a short identifier for the detected
virtualization technology. The following technologies
- are currently identified: <varname>qemu</varname>,
- <varname>kvm</varname>, <varname>vmware</varname>,
- <varname>microsoft</varname> (Hyper-V, also known as
- Viridian or Windows Server Virtualization),
- <varname>oracle</varname> (VirtualBox),
- <varname>xen</varname>, <varname>bochs</varname>,
- <varname>chroot</varname>, <varname>uml</varname>,
- <varname>openvz</varname>, <varname>lxc</varname>,
- <varname>lxc-libvirt</varname>,
- <varname>systemd-nspawn</varname>,
- <varname>docker</varname>.</para>
+ are currently identified:</para>
+
+ <table>
+ <title>Known VM virtualization technologies</title>
+ <tgroup cols='2' align='left' colsep='1' rowsep='1'>
+ <colspec colname="id" />
+ <colspec colname="product" />
+ <thead>
+ <row>
+ <entry>ID</entry>
+ <entry>VM Product</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><varname>qemu</varname></entry>
+ <entry>QEMU software virtualization</entry>
+ </row>
+ <row>
+ <entry><varname>kvm</varname></entry>
+ <entry>Linux KVM kernel virtual machine</entry>
+ </row>
+
+ <row>
+ <entry><varname>vmware</varname></entry>
+ <entry>VMware Workstation or Server, and related products</entry>
+ </row>
+
+ <row>
+ <entry><varname>microsoft</varname></entry>
+ <entry>Hyper-V, also known as Viridian or Windows Server Virtualization</entry>
+ </row>
+
+ <row>
+ <entry><varname>oracle</varname></entry>
+ <entry>Oracle VM VirtualBox (historically marketed by innotek and Sun Microsystems)</entry>
+ </row>
+
+ <row>
+ <entry><varname>xen</varname></entry>
+ <entry>Xen hypervisor</entry>
+ </row>
+
+ <row>
+ <entry><varname>bochs</varname></entry>
+ <entry>Bochs Emulator</entry>
+ </row>
+
+ <row>
+ <entry><varname>uml</varname></entry>
+ <entry>User-mode Linux</entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Known container virtualization technologies</title>
+ <tgroup cols='2' align='left' colsep='1' rowsep='1'>
+ <colspec colname="id" />
+ <colspec colname="product" />
+ <thead>
+ <row>
+ <entry>ID</entry>
+ <entry>Container Product</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><varname>openvz</varname></entry>
+ <entry>OpenVZ/Virtuozzo</entry>
+ </row>
+
+ <row>
+ <entry><varname>lxc</varname></entry>
+ <entry>Linux container implementation by LXC</entry>
+ </row>
+
+ <row>
+ <entry><varname>lxc-libvirt</varname></entry>
+ <entry>Linux container implementation by libvirt</entry>
+ </row>
+
+ <row>
+ <entry><varname>systemd-nspawn</varname></entry>
+ <entry>systemd's minimal container implementation, see <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry></entry>
+ </row>
+
+ <row>
+ <entry><varname>docker</varname></entry>
+ <entry>Docker container manager</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
<para>If multiple virtualization solutions are used,
only the "innermost" is detected and identified. That
@@ -135,7 +220,8 @@
<refsect1>
<title>See Also</title>
<para>
- <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para>
</refsect1>
More information about the systemd-commits
mailing list