From 90fb1f09386fd5d9e06ae8d589825bb3f5cd7777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 26 Apr 2019 14:13:53 +0200
Subject: [PATCH] basic/virt: treat "podman" as separate container type

We would detect podman as container-other. Let's assign a name to it.
Inspired by https://github.com/containers/libpod/issues/2996.
---
 man/systemd-detect-virt.xml | 9 +++++++--
 man/systemd.unit.xml        | 1 +
 src/basic/virt.c            | 2 ++
 src/basic/virt.h            | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 28d997cfa9..d599ac20f1 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -62,7 +62,7 @@
         </thead>
         <tbody>
           <row>
-            <entry valign="top" morerows="11">VM</entry>
+            <entry valign="top" morerows="12">VM</entry>
             <entry><varname>qemu</varname></entry>
             <entry>QEMU software virtualization, without KVM</entry>
           </row>
@@ -128,7 +128,7 @@
           </row>
 
           <row>
-            <entry valign="top" morerows="6">Container</entry>
+            <entry valign="top" morerows="7">Container</entry>
             <entry><varname>openvz</varname></entry>
             <entry>OpenVZ/Virtuozzo</entry>
           </row>
@@ -153,6 +153,11 @@
             <entry>Docker container manager</entry>
           </row>
 
+          <row>
+            <entry><varname>podman</varname></entry>
+            <entry><ulink url="https://podman.io">Podman</ulink> container manager</entry>
+          </row>
+
           <row>
             <entry><varname>rkt</varname></entry>
             <entry>rkt app container runtime</entry>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 81a02253ed..7562c9f324 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1089,6 +1089,7 @@
         <literal>lxc-libvirt</literal>,
         <literal>systemd-nspawn</literal>,
         <literal>docker</literal>,
+        <literal>podman</literal>,
         <literal>rkt</literal>,
         <literal>wsl</literal>,
         <literal>acrn</literal> to test
diff --git a/src/basic/virt.c b/src/basic/virt.c
index 1a213bb22e..0a1c729470 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -436,6 +436,7 @@ int detect_container(void) {
                 { "lxc-libvirt",    VIRTUALIZATION_LXC_LIBVIRT    },
                 { "systemd-nspawn", VIRTUALIZATION_SYSTEMD_NSPAWN },
                 { "docker",         VIRTUALIZATION_DOCKER         },
+                { "podman",         VIRTUALIZATION_PODMAN         },
                 { "rkt",            VIRTUALIZATION_RKT            },
                 { "wsl",            VIRTUALIZATION_WSL            },
         };
@@ -655,6 +656,7 @@ static const char *const virtualization_table[_VIRTUALIZATION_MAX] = {
         [VIRTUALIZATION_LXC] = "lxc",
         [VIRTUALIZATION_OPENVZ] = "openvz",
         [VIRTUALIZATION_DOCKER] = "docker",
+        [VIRTUALIZATION_PODMAN] = "podman",
         [VIRTUALIZATION_RKT] = "rkt",
         [VIRTUALIZATION_WSL] = "wsl",
         [VIRTUALIZATION_CONTAINER_OTHER] = "container-other",
diff --git a/src/basic/virt.h b/src/basic/virt.h
index c0836897f6..26f409afd0 100644
--- a/src/basic/virt.h
+++ b/src/basic/virt.h
@@ -31,6 +31,7 @@ enum {
         VIRTUALIZATION_LXC,
         VIRTUALIZATION_OPENVZ,
         VIRTUALIZATION_DOCKER,
+        VIRTUALIZATION_PODMAN,
         VIRTUALIZATION_RKT,
         VIRTUALIZATION_WSL,
         VIRTUALIZATION_CONTAINER_OTHER,