From 48e559c4f46cc612f2a81d49c612ed60971d352c Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 13 Jun 2024 10:54:10 +0200 Subject: meta-virt-container.inc: Install shadow in read-only rootfs Podman requires /etc/sub[g]uid for rootless mode but the file is being deleted if shadow is in ROOTFS_RO_UNNEEDED (even if different package like the podman itself provides it) and rpm backend is used. Signed-off-by: Pavel Zhukov Signed-off-by: Bruce Ashfield --- conf/distro/include/meta-virt-container.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/distro/include/meta-virt-container.inc b/conf/distro/include/meta-virt-container.inc index c3ac8394..6382ac37 100644 --- a/conf/distro/include/meta-virt-container.inc +++ b/conf/distro/include/meta-virt-container.inc @@ -38,3 +38,6 @@ VIRTUAL-RUNTIME_container_orchestration ??= "k3s" VIRTUAL-RUNTIME_cri ??= "virtual-containerd" VIRTUAL-RUNTIME_cni ??= "cni" + +CONTAINER_RO_REMOVE ?= " ${@bb.utils.contains('VIRTUAL-RUNTIME_container_engine', 'podman', 'shadow', '', d)}" +ROOTFS_RO_UNNEEDED:remove = "${CONTAINER_RO_REMOVE}" -- cgit v1.2.3-54-g00ecf