From: Wen Yang <wenyang@linux.alibaba.com>
Date: Wed, 19 Aug 2020 11:47:03 +0000 (+0800)
Subject: basic/virt: treat "pouch" as a container type (id: pouch)
X-Git-Tag: v247-rc1~404
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abac810b968df8d7345023cb3a08b8788dacfd49;p=thirdparty%2Fsystemd.git

basic/virt: treat "pouch" as a container type (id: pouch)
---

diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 24cbe9b368c..ac5ffa56451 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -172,6 +172,11 @@
             <entry><varname>proot</varname></entry>
             <entry><ulink url="https://proot-me.github.io/">proot</ulink> userspace chroot/bind mount emulation</entry>
           </row>
+
+          <row>
+            <entry><varname>pouch</varname></entry>
+            <entry><ulink url="https://github.com/alibaba/pouch">Pouch</ulink> Container Engine</entry>
+          </row>
         </tbody>
       </tgroup>
     </table>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index b3deb289564..7ef6080237e 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1169,6 +1169,7 @@
           <literal>rkt</literal>,
           <literal>wsl</literal>,
           <literal>proot</literal>,
+          <literal>pouch</literal>,
           <literal>acrn</literal> to test
           against a specific implementation, or
           <literal>private-users</literal> to check whether we are running in a user namespace. See
diff --git a/src/basic/virt.c b/src/basic/virt.c
index c6bff6b16e8..4c2280cfd61 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -442,6 +442,7 @@ static const char *const container_table[_VIRTUALIZATION_MAX] = {
         [VIRTUALIZATION_RKT]            = "rkt",
         [VIRTUALIZATION_WSL]            = "wsl",
         [VIRTUALIZATION_PROOT]          = "proot",
+        [VIRTUALIZATION_POUCH]          = "pouch",
 };
 
 DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING(container, int);
@@ -679,6 +680,7 @@ static const char *const virtualization_table[_VIRTUALIZATION_MAX] = {
         [VIRTUALIZATION_RKT] = "rkt",
         [VIRTUALIZATION_WSL] = "wsl",
         [VIRTUALIZATION_PROOT] = "proot",
+        [VIRTUALIZATION_POUCH] = "pouch",
         [VIRTUALIZATION_CONTAINER_OTHER] = "container-other",
 };
 
diff --git a/src/basic/virt.h b/src/basic/virt.h
index d58c582c912..18aa5eff153 100644
--- a/src/basic/virt.h
+++ b/src/basic/virt.h
@@ -35,6 +35,7 @@ enum {
         VIRTUALIZATION_RKT,
         VIRTUALIZATION_WSL,
         VIRTUALIZATION_PROOT,
+        VIRTUALIZATION_POUCH,
         VIRTUALIZATION_CONTAINER_OTHER,
         VIRTUALIZATION_CONTAINER_LAST = VIRTUALIZATION_CONTAINER_OTHER,