From a68c5004f859cc4f83d3523a90ea89680cc5b3e8 Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Mon, 21 Nov 2022 15:48:28 +0100 Subject: [PATCH] packaging/shim-v2: Only change the config if the file exists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not try to sed a file that doesn't exist, which may be the case depending on the architecture we're building the shim-v2 for. This is a partial-forward port of f24c47ea47e39bdc28bb740d5281eba21fa5727d. Fixes: #6293 Signed-off-by: Hyounggyu Choi Signed-off-by: Fabiano Fidêncio --- tools/packaging/static-build/shim-v2/build.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/packaging/static-build/shim-v2/build.sh b/tools/packaging/static-build/shim-v2/build.sh index 4d9d01da1d..6cbb0a41b3 100755 --- a/tools/packaging/static-build/shim-v2/build.sh +++ b/tools/packaging/static-build/shim-v2/build.sh @@ -12,6 +12,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" readonly repo_root_dir="$(cd "${script_dir}/../../../.." && pwd)" readonly kernel_builder="${repo_root_dir}/tools/packaging/kernel/build-kernel.sh" +VMM_CONFIGS="qemu fc" GO_VERSION=${GO_VERSION} RUST_VERSION=${RUST_VERSION} @@ -47,8 +48,12 @@ sudo docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \ "${container_image}" \ bash -c "git config --global --add safe.directory ${repo_root_dir} && make PREFIX="${PREFIX}" DESTDIR="${DESTDIR}" install" -sudo sed -i -e '/^initrd =/d' "${DESTDIR}/${PREFIX}/share/defaults/kata-containers/configuration-qemu.toml" -sudo sed -i -e '/^initrd =/d' "${DESTDIR}/${PREFIX}/share/defaults/kata-containers/configuration-fc.toml" +for vmm in ${VMM_CONFIGS}; do + config_file="${DESTDIR}/${PREFIX}/share/defaults/kata-containers/configuration-${vmm}.toml" + if [ -f ${config_file} ]; then + sudo sed -i -e '/^initrd =/d' ${config_file} + fi +done pushd "${DESTDIR}/${PREFIX}/share/defaults/kata-containers" sudo ln -sf "configuration-qemu.toml" configuration.toml