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 <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman 2022-09-23 09:33:35 +01:00
parent fb56efd658
commit c9af89d094

View File

@ -665,10 +665,6 @@ EOF
fi fi
if [ -n "${AA_KBC}" ]; then 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 if [ "${AA_KBC}" == "offline_sev_kbc" ]; then
info "Adding agent config for ${AA_KBC}" 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" AA_KBC_PARAMS="offline_sev_kbc::null" envsubst < "${script_dir}/agent-config.toml.in" | tee "${ROOTFS_DIR}/etc/agent-config.toml"