diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-11 00:02:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-11 00:02:37 +0000 |
| commit | 9ffe17a0bea317f5ead9c434514ed9e3349a93ec (patch) | |
| tree | 37ef56b91a538091a308264ec3cfa2c478cbffad /nixos/tests | |
| parent | aff5abb8728ad730e59f05d3d85d79a0b5d4803e (diff) | |
| parent | 0af84dc3af38e385fb28ebe16e572087a374e0e7 (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/installer.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 3adfa979edcc7..d441765fe194d 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -77,9 +77,9 @@ let let iface = if grubVersion == 1 then "ide" else "virtio"; isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi); bios = if pkgs.stdenv.isAarch64 then "QEMU_EFI.fd" else "OVMF.fd"; - in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then - throw "Non-EFI boot methods are only supported on i686 / x86_64" - else '' + in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then '' + machine.succeed("true") + '' else '' def assemble_qemu_flags(): flags = "-cpu max" ${if (system == "x86_64-linux" || system == "i686-linux") |