bottlerocket
bottlerocket copied to clipboard
add latest features to aws-dev and vmware-dev variants
Issue number: N/A
Description of changes:
Add the latest features to aws-dev and vmware-dev.
Testing done: Built and ran both variants, confirmed they booted up correctly.
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.
This is the OVF change in isolation:
diff --git a/variants/shared/template-unified-secboot.ovf b/variants/shared/template-unified-secboot-tpm.ovf
index a6df2e2ec..dd932b5f8 100644
--- a/variants/shared/template-unified-secboot.ovf
+++ b/variants/shared/template-unified-secboot-tpm.ovf
@@ -69,6 +69,13 @@
<vmw:Config ovf:required="false" vmw:key="connectable.allowGuestControl" vmw:value="true"/>
<vmw:Config ovf:required="false" vmw:key="wakeOnLanEnabled" vmw:value="false"/>
</Item>
+ <Item ovf:required="false">
+ <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
+ <rasd:ElementName>Virtual TPM</rasd:ElementName>
+ <rasd:InstanceID>13</rasd:InstanceID>
+ <rasd:ResourceSubType>vmware.vtpm</rasd:ResourceSubType>
+ <rasd:ResourceType>1</rasd:ResourceType>
+ </Item>
<vmw:Config ovf:required="false" vmw:key="bootOptions.efiSecureBootEnabled" vmw:value="true"/>
<vmw:Config ovf:required="false" vmw:key="firmware" vmw:value="efi"/>
<vmw:ExtraConfig ovf:required="false" vmw:key="disk.enableUUID" vmw:value="true"/>