movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/tests/boot.nix: Remove empty module

Browse source
This commit is contained in:
Eelco Dolstra 2016-05-25 10:21:14 +02:00
parent f78831c8b6
commit fe875b4100
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/tests/boot.nix
View file

@ -12,7 +12,6 @@ let
modules = modules =
[ ../modules/installer/cd-dvd/installation-cd-minimal.nix [ ../modules/installer/cd-dvd/installation-cd-minimal.nix
../modules/testing/test-instrumentation.nix ../modules/testing/test-instrumentation.nix
{ key = "serial"; }
]; ];
}).config.system.build.isoImage; }).config.system.build.isoImage;
@ -30,20 +29,25 @@ let
''; '';
}; };
in { in {
biosCdrom = makeBootTest "bios-cdrom" '' biosCdrom = makeBootTest "bios-cdrom" ''
cdrom => glob("${iso}/iso/*.iso") cdrom => glob("${iso}/iso/*.iso")
''; '';
biosUsb = makeBootTest "bios-usb" '' biosUsb = makeBootTest "bios-usb" ''
usb => glob("${iso}/iso/*.iso") usb => glob("${iso}/iso/*.iso")
''; '';
uefiCdrom = makeBootTest "uefi-cdrom" '' uefiCdrom = makeBootTest "uefi-cdrom" ''
cdrom => glob("${iso}/iso/*.iso"), cdrom => glob("${iso}/iso/*.iso"),
bios => '${pkgs.OVMF}/FV/OVMF.fd' bios => '${pkgs.OVMF}/FV/OVMF.fd'
''; '';
uefiUsb = makeBootTest "uefi-usb" '' uefiUsb = makeBootTest "uefi-usb" ''
usb => glob("${iso}/iso/*.iso"), usb => glob("${iso}/iso/*.iso"),
bios => '${pkgs.OVMF}/FV/OVMF.fd' bios => '${pkgs.OVMF}/FV/OVMF.fd'
''; '';
netboot = let netboot = let
config = (import ../lib/eval-config.nix { config = (import ../lib/eval-config.nix {
inherit system; inherit system;