diff --git a/ic-os/components/hostos-scripts/guestos/guestos.xml.template b/ic-os/components/hostos-scripts/guestos/guestos.xml.template index 80eaa63e48c..ebd5d2188c2 100755 --- a/ic-os/components/hostos-scripts/guestos/guestos.xml.template +++ b/ic-os/components/hostos-scripts/guestos/guestos.xml.template @@ -14,11 +14,23 @@ /machine - hvm - /usr/share/OVMF/OVMF_CODE_4M.fd - /var/lib/libvirt/qemu/nvram/guestos_VARS.fd - + hvm + /usr/share/ovmf/OVMF.fd + /tmp/sev-boot-components/vmlinuz + /tmp/sev-boot-components/initrd.img + BOOT_IMAGE=/vmlinuz root=/dev/vda5 console=ttyS0 dfinity.system=A dfinity.boot_state=stable security=selinux selinux=1 enforcing=1 root_hash=XXXTODOXXX + + + 51 + 1 + 30000 + + + + + + diff --git a/ic-os/components/hostos-scripts/guestos/kvm-cpu.xml b/ic-os/components/hostos-scripts/guestos/kvm-cpu.xml index e1ee7d530ee..c3d1f245f8f 100644 --- a/ic-os/components/hostos-scripts/guestos/kvm-cpu.xml +++ b/ic-os/components/hostos-scripts/guestos/kvm-cpu.xml @@ -3,3 +3,7 @@ + + + + diff --git a/ic-os/components/hostos-scripts/guestos/start-guestos.sh b/ic-os/components/hostos-scripts/guestos/start-guestos.sh index 3dab15b4855..8650e790818 100755 --- a/ic-os/components/hostos-scripts/guestos/start-guestos.sh +++ b/ic-os/components/hostos-scripts/guestos/start-guestos.sh @@ -40,6 +40,17 @@ write_tty1_log() { logger -t "${SCRIPT}" "${message}" } +function setup_sev_mounts() { + if [ "$(mount | grep 'sev-boot-components')" ]; then + write_log "SEV boot components are already ready." + else + write_log "Setting up SEV boot components." + mkdir -p /tmp/sev-boot-components/ + losetup -P /dev/loop99 /dev/mapper/hostlvm-guestos + mount /dev/loop99p4 /tmp/sev-boot-components/ + fi +} + function define_guestos() { if [ "$(virsh list --all | grep 'guestos')" ]; then write_log "GuestOS virtual machine is already defined." @@ -119,6 +130,7 @@ function start_guestos() { function main() { # Establish run order + setup_sev_mounts define_guestos start_guestos }