podman: improve packaging

* keep /etc/containers accross sysupgrade
* make 'runc' the default run-time for now

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/utils/podman/Makefile b/utils/podman/Makefile
index 98e403298214786aea15e29f092bdd81d6f5c6cd..24ad25d69debbe2f9a6c4f675fa3d36f3c535e84 100644 (file)
--- a/utils/podman/Makefile
+++ b/utils/podman/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=podman
 PKG_VERSION:=2.1.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
@@ -50,6 +50,10 @@ define Package/podman/description
   Podman: A tool for managing OCI containers and pods
 endef
 
+define Package/podman/conffiles
+/etc/containers
+endef
+
 define Build/Prepare
        $(call Build/Prepare/Default)
        $(eval $(call Download,default-registries))

diff --git a/utils/podman/files/containers.conf b/utils/podman/files/containers.conf
index 054690b11030ff8f9ea2398a23757cc89ec1db3f..8730f1a4884fde80778a3259501618ef33b36261 100644 (file)
--- a/utils/podman/files/containers.conf
+++ b/utils/podman/files/containers.conf
@@ -7,6 +7,7 @@ network_config_dir="/etc/cni/net.d/"
 default_network="podman"
 
 [engine]
+runtime="/usr/sbin/runc"
 # runtime="/sbin/uxc"
 # runtime_supports_nocgroups = ["crun", "uxc"]
 # runtime_supports_json = ["crun", "runc", "kata", "uxc"]