podman: ship storage.conf and use runc by default for now

Ship podman with defaults more coherent with user expectations and
more likely to work out-of-the-box.

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

diff --git a/utils/podman/Makefile b/utils/podman/Makefile
index 7619918a4a9dee8f11ae8f2d5f93ac146368cbdc..98e403298214786aea15e29f092bdd81d6f5c6cd 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:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
@@ -61,6 +61,7 @@ define Package/podman/install
        $(INSTALL_DIR) $(1)/etc/containers
        $(INSTALL_CONF) $(DL_DIR)/default-policy.json-362f70b056 $(1)/etc/containers/policy.json
        $(INSTALL_CONF) $(DL_DIR)/registries.fedora-da9a9c8778 $(1)/etc/containers/registries.conf
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/vendor/github.com/containers/storage/storage.conf $(1)/etc/containers/storage.conf
        $(INSTALL_CONF) ./files/containers.conf $(1)/etc/containers/containers.conf
        $(INSTALL_DIR) $(1)/etc/cni/net.d
        $(INSTALL_CONF) $(PKG_BUILD_DIR)/cni/87-podman-bridge.conflist $(1)/etc/cni/net.d/

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