Merge pull request nix-community#643 from MatthewCroughan/mc/ovmf

make-disk-image: use OVMF efi always
jopejoe1 · May 21, 2024 · f1654e0 · f1654e0
2 parents 6f01b97 + 6c37763
commit f1654e0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/make-disk-image.nix b/lib/make-disk-image.nix
@@ -73,7 +73,8 @@ let
     ${systemToInstall.config.system.build.nixos-install}/bin/nixos-install --root ${systemToInstall.config.disko.rootMountPoint} --system ${systemToInstall.config.system.build.toplevel} --keep-going --no-channel-copy -v --no-root-password --option binary-caches ""
     umount -Rv ${systemToInstall.config.disko.rootMountPoint}
   '';
-  QEMU_OPTS = lib.concatMapStringsSep " " (disk: "-drive file=${disk.name}.raw,if=virtio,cache=unsafe,werror=report,format=raw") (lib.attrValues nixosConfig.config.disko.devices.disk);
+
+  QEMU_OPTS = "-drive if=pflash,format=raw,unit=0,readonly=on,file=${pkgs.OVMF.firmware}" + " " + (lib.concatMapStringsSep " " (disk: "-drive file=${disk.name}.raw,if=virtio,cache=unsafe,werror=report,format=raw") (lib.attrValues nixosConfig.config.disko.devices.disk));
 in
 {
   pure = vmTools.runInLinuxVM (pkgs.runCommand name