Merge pull request #220308 from amjoseph-nixpkgs/pr/hydra/fix-eval
nixos/tests/installer.nix: fix hydra eval
This commit is contained in:
commit
93fc62fd29
|
@ -77,9 +77,9 @@ let
|
||||||
let iface = if grubVersion == 1 then "ide" else "virtio";
|
let iface = if grubVersion == 1 then "ide" else "virtio";
|
||||||
isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
|
isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
|
||||||
bios = if pkgs.stdenv.isAarch64 then "QEMU_EFI.fd" else "OVMF.fd";
|
bios = if pkgs.stdenv.isAarch64 then "QEMU_EFI.fd" else "OVMF.fd";
|
||||||
in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then
|
in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then ''
|
||||||
throw "Non-EFI boot methods are only supported on i686 / x86_64"
|
machine.succeed("true")
|
||||||
else ''
|
'' else ''
|
||||||
def assemble_qemu_flags():
|
def assemble_qemu_flags():
|
||||||
flags = "-cpu max"
|
flags = "-cpu max"
|
||||||
${if (system == "x86_64-linux" || system == "i686-linux")
|
${if (system == "x86_64-linux" || system == "i686-linux")
|
||||||
|
|
Loading…
Reference in a new issue