shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

detect-virt: add rkt app container runtime

Browse Source
This commit is contained in:
Iago López Galeiras 2015-11-09 14:37:43 +01:00
parent 6aadfa4c52
commit 9fb1642519
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
man/systemd-detect-virt.xml
View File

@ -163,6 +163,11 @@
<entry><varname>docker</varname></entry> <entry><varname>docker</varname></entry>
<entry>Docker container manager</entry> <entry>Docker container manager</entry>
</row> </row>
<row>
<entry><varname>rkt</varname></entry>
<entry>rkt app container runtime</entry>
</row>
</tbody> </tbody>
</tgroup> </tgroup>
</table> </table>

3
man/systemd.unit.xml
View File

@ -854,7 +854,8 @@
<varname>lxc</varname>, <varname>lxc</varname>,
<varname>lxc-libvirt</varname>, <varname>lxc-libvirt</varname>,
<varname>systemd-nspawn</varname>, <varname>systemd-nspawn</varname>,
<varname>docker</varname> to test <varname>docker</varname>,
<varname>rkt</varname> to test
against a specific implementation. See against a specific implementation. See
<citerefentry><refentrytitle>systemd-detect-virt</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd-detect-virt</refentrytitle><manvolnum>1</manvolnum></citerefentry>
for a full list of known virtualization technologies and their for a full list of known virtualization technologies and their

2
src/basic/virt.c
View File

@ -329,6 +329,7 @@ int detect_container(void) {
{ "lxc-libvirt", VIRTUALIZATION_LXC_LIBVIRT }, { "lxc-libvirt", VIRTUALIZATION_LXC_LIBVIRT },
{ "systemd-nspawn", VIRTUALIZATION_SYSTEMD_NSPAWN }, { "systemd-nspawn", VIRTUALIZATION_SYSTEMD_NSPAWN },
{ "docker", VIRTUALIZATION_DOCKER }, { "docker", VIRTUALIZATION_DOCKER },
{ "rkt", VIRTUALIZATION_RKT },
}; };
static thread_local int cached_found = _VIRTUALIZATION_INVALID; static thread_local int cached_found = _VIRTUALIZATION_INVALID;
@ -445,6 +446,7 @@ static const char *const virtualization_table[_VIRTUALIZATION_MAX] = {
[VIRTUALIZATION_LXC] = "lxc", [VIRTUALIZATION_LXC] = "lxc",
[VIRTUALIZATION_OPENVZ] = "openvz", [VIRTUALIZATION_OPENVZ] = "openvz",
[VIRTUALIZATION_DOCKER] = "docker", [VIRTUALIZATION_DOCKER] = "docker",
[VIRTUALIZATION_RKT] = "rkt",
[VIRTUALIZATION_CONTAINER_OTHER] = "container-other", [VIRTUALIZATION_CONTAINER_OTHER] = "container-other",
}; };

1
src/basic/virt.h
View File

@ -48,6 +48,7 @@ enum {
VIRTUALIZATION_LXC, VIRTUALIZATION_LXC,
VIRTUALIZATION_OPENVZ, VIRTUALIZATION_OPENVZ,
VIRTUALIZATION_DOCKER, VIRTUALIZATION_DOCKER,
VIRTUALIZATION_RKT,
VIRTUALIZATION_CONTAINER_OTHER, VIRTUALIZATION_CONTAINER_OTHER,
VIRTUALIZATION_CONTAINER_LAST = VIRTUALIZATION_CONTAINER_OTHER, VIRTUALIZATION_CONTAINER_LAST = VIRTUALIZATION_CONTAINER_OTHER,