detect-virt: add rkt app container runtime

diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 190ab19152ec435d931a1800bc6b6d25037ec451..9a4762a4cae1d84793aff375739625d158936bc3 100644 (file)
--- 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 a4eeccaed44b04b3acc2adc5ec5cb6b96cda27d9..40c9973627be001f0851072ac914118781485c50 100644 (file)
--- 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 a211ea1f86fe573905622e79c43a47bb3f755ea2..ff006e96c635d160db87dfe971aedf623b725848 100644 (file)
--- 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 ed83608019d1a0c7d765db764efe9e82a39f9a05..aca961867c4146ce8d7f367368e71068b7db5c1b 100644 (file)
--- 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,