diff --git a/images/Dockerfile.vms b/images/Dockerfile.vms index bcee093..6fac05d 100644 --- a/images/Dockerfile.vms +++ b/images/Dockerfile.vms @@ -1,6 +1,8 @@ FROM ubuntu:20.04 RUN apt update -y && \ - apt install -y qemu-system-x86 ovmf ifupdown net-tools telnet + apt install -y qemu-system-x86 ifupdown net-tools telnet + +COPY --from=ghcr.io/metal-stack/mini-lab-ovmf:edk2-stable202408.01 /OVMF_*.fd /opt/OVMF/ CMD ["/mini-lab/vms_entrypoint.sh"] diff --git a/scripts/manage_vms.py b/scripts/manage_vms.py index 0b015ec..aa67209 100755 --- a/scripts/manage_vms.py +++ b/scripts/manage_vms.py @@ -125,8 +125,8 @@ def _start_vm(machine): "-boot", "n", "-cpu", "host", "-drive", "if=virtio,format=qcow2,file={disk}".format(disk=machine.get("disk-path")), - "-drive", "if=pflash,format=raw,readonly,file=/usr/share/OVMF/OVMF_CODE.fd", - "-drive", "if=pflash,format=raw,readonly,file=/usr/share/OVMF/OVMF_VARS.fd", + "-drive", "if=pflash,format=raw,readonly,file=/opt/OVMF/OVMF_CODE.fd", + "-drive", "if=pflash,format=raw,readonly,file=/opt/OVMF/OVMF_VARS.fd", "-serial", "telnet:127.0.0.1:{port},server,nowait".format(port=machine.get("serial-port")), "-enable-kvm", "-nographic",