From 5a78d90797b8b666adc39ff1587fcb2155e55052 Mon Sep 17 00:00:00 2001 From: Tobin Feldman-Fitzthum Date: Fri, 14 Jul 2023 16:20:08 -0500 Subject: [PATCH] local-build: always use DEFSERVICEOFFLOAD for CoCo DEFSERVICEOFFLOAD controls whether images are pulled inside the guest. This should always be set for CoCo, not just when we use MEASURED_ROOTFS. Fixes: #7350 Signed-off-by: Tobin Feldman-Fitzthum --- .../kata-deploy/local-build/kata-deploy-binaries.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 6b25e5f152..47dc2dbfe5 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -392,8 +392,8 @@ install_cc_shimv2() { export RUST_VERSION export REMOVE_VMM_CONFIGS="acrn fc" + extra_opts="DEFSERVICEOFFLOAD=true" if [ "${MEASURED_ROOTFS}" == "yes" ]; then - extra_opts="DEFSERVICEOFFLOAD=true" if [ -f "${repo_root_dir}/tools/osbuilder/root_hash_vanilla.txt" ]; then root_hash=$(sudo sed -e 's/Root hash:\s*//g;t;d' "${repo_root_dir}/tools/osbuilder/root_hash_vanilla.txt") root_measure_config="cc_rootfs_verity.scheme=dm-verity cc_rootfs_verity.hash=${root_hash}" @@ -405,12 +405,9 @@ install_cc_shimv2() { root_measure_config="cc_rootfs_verity.scheme=dm-verity cc_rootfs_verity.hash=${root_hash}" extra_opts+=" ROOTMEASURECONFIGTDX=\"${root_measure_config}\"" fi - - info "extra_opts: ${extra_opts}" - DESTDIR="${destdir}" PREFIX="${cc_prefix}" EXTRA_OPTS="${extra_opts}" "${shimv2_builder}" - else - DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${shimv2_builder}" fi + info "extra_opts: ${extra_opts}" + DESTDIR="${destdir}" PREFIX="${cc_prefix}" EXTRA_OPTS="${extra_opts}" "${shimv2_builder}" } # Install static CC virtiofsd asset