picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1838 from keszybz/trivialities

Browse source 
Trivialities
This commit is contained in:
Tom Gundersen 2015-11-11 02:21:06 +01:00
parent e3c4a681db 3917a2bb45
commit 6899d2bfb0
2 changed files with 38 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TODO
View file

@ -918,8 +918,6 @@ External:
* dbus: in fedora, make /var/lib/dbus/machine-id a symlink to /etc/machine-id
* add "# export SYSTEMD_PAGER=" to bash login
* /usr/bin/service should actually show the new command line
* fedora: suggest auto-restart on failure, but not on success and not on coredump. also, ask people to think about changing the start limit logic. Also point people to RestartPreventExitStatus=, SuccessExitStatus=

76
man/systemd-detect-virt.xml
View file

@ -22,7 +22,7 @@
-->
<refentry id="systemd-detect-virt"
xmlns:xi="http://www.w3.org/2001/XInclude">
xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-detect-virt</title>
@ -81,92 +81,92 @@
<colspec colname="product" />
<thead>
<row>
<entry>Type</entry>
<entry>ID</entry>
<entry>Product</entry>
<entry>Type</entry>
<entry>ID</entry>
<entry>Product</entry>
</row>
</thead>
<tbody>
<row>
<entry morerows="9">VM</entry>
<entry><varname>qemu</varname></entry>
<entry>QEMU software virtualization</entry>
<entry morerows="9">VM</entry>
<entry><varname>qemu</varname></entry>
<entry>QEMU software virtualization</entry>
</row>
<row>
<entry><varname>kvm</varname></entry>
<entry>Linux KVM kernel virtual machine</entry>
<entry><varname>kvm</varname></entry>
<entry>Linux KVM kernel virtual machine</entry>
</row>
<row>
<entry><varname>zvm</varname></entry>
<entry>s390 z/VM</entry>
<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>
<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>
<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>
<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 (only domU, not dom0)</entry>
<entry><varname>xen</varname></entry>
<entry>Xen hypervisor (only domU, not dom0)</entry>
</row>
<row>
<entry><varname>bochs</varname></entry>
<entry>Bochs Emulator</entry>
<entry><varname>bochs</varname></entry>
<entry>Bochs Emulator</entry>
</row>
<row>
<entry><varname>uml</varname></entry>
<entry>User-mode Linux</entry>
<entry><varname>uml</varname></entry>
<entry>User-mode Linux</entry>
</row>
<row>
<entry><varname>parallels</varname></entry>
<entry>Parallels Desktop, Parallels Server</entry>
<entry><varname>parallels</varname></entry>
<entry>Parallels Desktop, Parallels Server</entry>
</row>
<row>
<entry morerows="5">Container</entry>
<entry><varname>openvz</varname></entry>
<entry>OpenVZ/Virtuozzo</entry>
<entry morerows="5">Container</entry>
<entry><varname>openvz</varname></entry>
<entry>OpenVZ/Virtuozzo</entry>
</row>
<row>
<entry><varname>lxc</varname></entry>
<entry>Linux container implementation by LXC</entry>
<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>
<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>
<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>
<entry><varname>docker</varname></entry>
<entry>Docker container manager</entry>
</row>
<row>
<entry><varname>rkt</varname></entry>
<entry>rkt app container runtime</entry>
<entry><varname>rkt</varname></entry>
<entry>rkt app container runtime</entry>
</row>
</tbody>
</tgroup>