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 /src/basic | |
| 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 'src/basic')
| -rw-r--r-- | src/basic/virt.c | 2 | ||||
| -rw-r--r-- | src/basic/virt.h | 1 |
2 files changed, 3 insertions, 0 deletions
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, |