@@ -17,7 +17,7 @@ let
1717 ];
1818 }).config.system.build.isoImage;
1919
20− perlAttrs = params: "{ ${concatStringsSep "," (mapAttrsToList (name: param: "${name} => '${toString param}'") params)} }";
20+ perlAttrs = params: "{ ${concatStringsSep ", " (mapAttrsToList (name: param: "${name} => ${builtins.toJSON param}") params)} }";
2121
2222 makeBootTest = name: extraConfig:
2323 let
@@ -79,28 +79,28 @@ let
7979in {
8080
8181 biosCdrom = makeBootTest "bios-cdrom" {
82− cdrom = ''glob("${iso}/iso/*.iso")'';
82+ cdrom = "${iso}/iso/${iso.isoName}";
8383 };
8484
8585 biosUsb = makeBootTest "bios-usb" {
86− usb = ''glob("${iso}/iso/*.iso")'';
86+ usb = "${iso}/iso/${iso.isoName}";
8787 };
8888
8989 uefiCdrom = makeBootTest "uefi-cdrom" {
90− cdrom = ''glob("${iso}/iso/*.iso"'';
91− bios = ''"${pkgs.OVMF.fd}/FV/OVMF.fd"'';
90+ cdrom = "${iso}/iso/${iso.isoName}";
91+ bios = "${pkgs.OVMF.fd}/FV/OVMF.fd";
9292 };
9393
9494 uefiUsb = makeBootTest "uefi-usb" {
95− usb = ''glob("${iso}/iso/*.iso")'';
96− bios = ''"${pkgs.OVMF.fd}/FV/OVMF.fd"'';
95+ usb = "${iso}/iso/${iso.isoName}";
96+ bios = "${pkgs.OVMF.fd}/FV/OVMF.fd";
9797 };
9898
9999 biosNetboot = makeNetbootTest "bios" {};
100100
101101 uefiNetboot = makeNetbootTest "uefi" {
102− bios = ''"${pkgs.OVMF.fd}/FV/OVMF.fd"'';
102+ bios = "${pkgs.OVMF.fd}/FV/OVMF.fd";
103103 # Custom ROM is needed for EFI PXE boot. I failed to understand exactly why, because QEMU should still use iPXE for EFI.
104− netFrontendArgs = ''romfile="${pkgs.ipxe}/ipxe.efirom"'';
104+ netFrontendArgs = "romfile=${pkgs.ipxe}/ipxe.efirom";
105105 };
106106}