From ed426fb95159af96ebd07855392ba6bd7f5ff0d7 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 20 Nov 2020 00:30:38 +0000 Subject: [PATCH] podman: improve packaging * keep /etc/containers accross sysupgrade * make 'runc' the default run-time for now Signed-off-by: Daniel Golle --- utils/podman/Makefile | 6 +++++- utils/podman/files/containers.conf | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/utils/podman/Makefile b/utils/podman/Makefile index 98e403298..24ad25d69 100644 --- 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 054690b11..8730f1a48 100644 --- 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"]