From: W. Michael Petullo <mike@flyn.org>
Date: Fri, 21 May 2021 02:55:13 +0000 (-0500)
Subject: podman: change permissions on /etc/containers
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=16a3da37a8e2b05078c24aa22ef7ff5aaf7f4af0;p=feed%2Fpackages.git

podman: change permissions on /etc/containers

Running podman as users other than root seems to require that those
users can read the configuration files in /etc/containers. This change
sets the permissions of /etc/containers and its contents to match those
used on Fedora.

Signed-off-by: W. Michael Petullo <mike@flyn.org>
(cherry picked from commit f51ef46aa6adad6ba95ebc15c50e847044984b36)
---

diff --git a/utils/podman/Makefile b/utils/podman/Makefile
index 00b5dfc93a..c25e92240c 100644
--- a/utils/podman/Makefile
+++ b/utils/podman/Makefile
@@ -93,10 +93,10 @@ endef
 define Package/podman/install
 	$(call GoPackage/Package/Install/Bin,$(1))
 	$(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_DATA) $(DL_DIR)/default-policy.json-362f70b056 $(1)/etc/containers/policy.json
+	$(INSTALL_DATA) $(DL_DIR)/registries.fedora-da9a9c8778 $(1)/etc/containers/registries.conf
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/vendor/github.com/containers/storage/storage.conf $(1)/etc/containers/storage.conf
+	$(INSTALL_DATA) ./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/
 	$(INSTALL_DIR) $(1)/etc/init.d