ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

nixos: iso-image: use memtest86 params in syslinux

Browse Source 
See also #6593.
This commit is contained in:
Bob van der Linden 2015-01-21 14:00:18 +01:00 committed by Vladimír Čunát
parent c57a912016
commit f0fd1c9bcf
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -46,6 +46,13 @@ let
INITRD /boot/initrd INITRD /boot/initrd
''; '';
isolinuxMemtest86Entry = ''
LABEL memtest
MENU LABEL Memtest86+
LINUX /boot/memtest.bin
APPEND ${toString config.boot.loader.grub.memtest86.params}
'';
isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry);
# The efi boot image # The efi boot image
@ -289,6 +296,10 @@ in
{ source = "${efiDir}/loader"; { source = "${efiDir}/loader";
target = "/loader"; target = "/loader";
} }
] ++ optionals config.boot.loader.grub.memtest86.enable [
{ source = "${pkgs.memtest86plus}/memtest.bin";
target = "/boot/memtest.bin";
}
]; ];
boot.loader.timeout = 10; boot.loader.timeout = 10;