From 3131daace1eed2b642ab56c5843fd2057fbbfde3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 23 Mar 2018 19:27:31 +0200 Subject: [PATCH] nixos/tests/installer: Give eval failure on unsupported boot methods --- nixos/tests/installer.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index f67011b4412c1..acf248d0a5a66 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -80,8 +80,9 @@ let + optionalString isEfi (if pkgs.stdenv.isAarch64 then ''bios => "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd", '' else ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", ''); - in - '' + in if !isEfi && !(pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then + throw "Non-EFI boot methods are only supported on i686 / x86_64" + else '' $machine->start; # Make sure that we get a login prompt etc.