From c9af89d094718c87b42311f35d7b171be5c93bb1 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Fri, 23 Sep 2022 09:33:35 +0100 Subject: [PATCH] osbuilder: don't pull in umoci with attestation Umoci is not longer required if we have the attestation-agent, so don't override the user input Fixes: #5237 Signed-off-by: stevenhorsman --- tools/osbuilder/rootfs-builder/rootfs.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh index 7cd4be553b..676177e0f6 100755 --- a/tools/osbuilder/rootfs-builder/rootfs.sh +++ b/tools/osbuilder/rootfs-builder/rootfs.sh @@ -665,10 +665,6 @@ EOF fi if [ -n "${AA_KBC}" ]; then - if [ "${UMOCI}" != "yes" ]; then - UMOCI="yes" - warning "UMOCI wasn't set, but is required for attestation, so overridden" - fi if [ "${AA_KBC}" == "offline_sev_kbc" ]; then info "Adding agent config for ${AA_KBC}" AA_KBC_PARAMS="offline_sev_kbc::null" envsubst < "${script_dir}/agent-config.toml.in" | tee "${ROOTFS_DIR}/etc/agent-config.toml"