From a72b08117ffab6dc8c965b0ab2b11c1b3b9d1915 Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Tue, 3 Aug 2021 18:28:17 +0200 Subject: [PATCH] osbuilder: pass env OS_VERSION With lines like https://github.com/kata-containers/kata-containers/blob/0a2e2c6038ff9623610d62cad8db1d723dd500cb/tools/osbuilder/rootfs-builder/fedora/config.sh#L8 we imply that one can set another OS_VERSION and it will get picked up. This is not the case when building inside Docker/Podman because the variable is not passed to the container, which can lead to confusion. Forward this env. Fixes: #2378 Signed-off-by: Jakob Naucke --- tools/osbuilder/rootfs-builder/rootfs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh index 4bfe7bd6dc..c058c257a1 100755 --- a/tools/osbuilder/rootfs-builder/rootfs.sh +++ b/tools/osbuilder/rootfs-builder/rootfs.sh @@ -410,6 +410,7 @@ build_rootfs_distro() --env KERNEL_MODULES_DIR="${KERNEL_MODULES_DIR}" \ --env EXTRA_PKGS="${EXTRA_PKGS}" \ --env OSBUILDER_VERSION="${OSBUILDER_VERSION}" \ + --env OS_VERSION="${OS_VERSION}" \ --env INSIDE_CONTAINER=1 \ --env SECCOMP="${SECCOMP}" \ --env DEBUG="${DEBUG}" \