tweak config for podman 2

1 files changed, 12 insertions, 4 deletions

diff --git a/configure-podman b/configure-podman
index c2c4016..2fafa59 100755
--- a/configure-podman
+++ b/configure-podman
@@ -15,10 +15,18 @@ sed -i.orig -e '/^driver/s/overlay/vfs/' /etc/containers/storage.conf
 diff -u /etc/containers/storage.conf.orig /etc/containers/storage.conf
 
 # cgroups: there is no systemd managing the container, so use cgroupfs directly
-echo "# update podman cgroups config"
-cp /usr/share/containers/libpod.conf /etc/containers
-sed -i.orig -e '/^cgroup_manager/s/systemd/cgroupfs/' /etc/containers/libpod.conf
-diff -u /etc/containers/libpod.conf.orig /etc/containers/libpod.conf
+if test -f /usr/share/containers/containers.conf; then
+    file="containers.conf"
+else
+    file="libpod.conf"
+fi
+echo "# update podman cgroups config ($file)"
+cp /usr/share/containers/${file} /etc/containers
+sed -i.orig \
+    -e '/cgroup_manager/s/^# //' \
+    -e '/cgroup_manager/s/systemd/cgroupfs/' \
+    /etc/containers/${file}
+diff -u /etc/containers/${file}.orig /etc/containers/${file}
 
 echo "# silence docker emulation notification"
 touch /etc/containers/nodocker