Merge pull request #5238 from stevenhorsman/don't-default-umoci-in-rootfs

osbuilder: don't pull in umoci with attestation
This commit is contained in:
Wainer Moschetta 2022-09-26 10:38:16 -03:00 committed by GitHub
commit 8ad86e2ec9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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"