diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-11-09 16:50:57 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-11-09 16:50:57 +0100 |
| commit | f094cb287ed535a8f45e0ce61a57a06bec642876 (patch) | |
| tree | f7c9de5feb185fa3d1de52f275953625f7cf86b0 /man | |
| parent | 4286219103a7791ff9114b7dcc8e9938d154af3e (diff) | |
| parent | 9fb16425199c2b9cf1d6cc1cafb974bdfbceec5c (diff) | |
Merge pull request #1817 from iaguis/nspawn-custom-service-3
nspawn: support custom container service name
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 190ab19152..9a4762a4ca 100644 --- a/man/systemd-detect-virt.xml +++ b/man/systemd-detect-virt.xml @@ -163,6 +163,11 @@ <entry><varname>docker</varname></entry> <entry>Docker container manager</entry> </row> + + <row> + <entry><varname>rkt</varname></entry> + <entry>rkt app container runtime</entry> + </row> </tbody> </tgroup> </table> diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index a4eeccaed4..40c9973627 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -854,7 +854,8 @@ <varname>lxc</varname>, <varname>lxc-libvirt</varname>, <varname>systemd-nspawn</varname>, - <varname>docker</varname> to test + <varname>docker</varname>, + <varname>rkt</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 |