diff options
| author | Iago López Galeiras <iaguis@gmail.com> | 2015-11-09 14:37:43 +0100 |
|---|---|---|
| committer | Iago López Galeiras <iaguis@gmail.com> | 2015-11-09 16:40:35 +0100 |
| commit | 9fb16425199c2b9cf1d6cc1cafb974bdfbceec5c (patch) | |
| tree | f055aba4501c3ad5f4c5e5ff130b08da7aa24188 | |
| parent | 6aadfa4c5239f6cd2a80e82f6bc102cc116583df (diff) | |
detect-virt: add rkt app container runtime
| -rw-r--r-- | man/systemd-detect-virt.xml | 5 | ||||
| -rw-r--r-- | man/systemd.unit.xml | 3 | ||||
| -rw-r--r-- | src/basic/virt.c | 2 | ||||
| -rw-r--r-- | src/basic/virt.h | 1 |
4 files changed, 10 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 diff --git a/src/basic/virt.c b/src/basic/virt.c index a211ea1f86..ff006e96c6 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -329,6 +329,7 @@ int detect_container(void) { { "lxc-libvirt", VIRTUALIZATION_LXC_LIBVIRT }, { "systemd-nspawn", VIRTUALIZATION_SYSTEMD_NSPAWN }, { "docker", VIRTUALIZATION_DOCKER }, + { "rkt", VIRTUALIZATION_RKT }, }; static thread_local int cached_found = _VIRTUALIZATION_INVALID; @@ -445,6 +446,7 @@ static const char *const virtualization_table[_VIRTUALIZATION_MAX] = { [VIRTUALIZATION_LXC] = "lxc", [VIRTUALIZATION_OPENVZ] = "openvz", [VIRTUALIZATION_DOCKER] = "docker", + [VIRTUALIZATION_RKT] = "rkt", [VIRTUALIZATION_CONTAINER_OTHER] = "container-other", }; diff --git a/src/basic/virt.h b/src/basic/virt.h index ed83608019..aca961867c 100644 --- a/src/basic/virt.h +++ b/src/basic/virt.h @@ -48,6 +48,7 @@ enum { VIRTUALIZATION_LXC, VIRTUALIZATION_OPENVZ, VIRTUALIZATION_DOCKER, + VIRTUALIZATION_RKT, VIRTUALIZATION_CONTAINER_OTHER, VIRTUALIZATION_CONTAINER_LAST = VIRTUALIZATION_CONTAINER_OTHER, |