diff options
| author | Bob van der Linden <bobvanderlinden@gmail.com> | 2015-01-21 14:00:18 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-03-24 22:15:11 +0100 |
| commit | f0fd1c9bcfd745d3576dc8ca1357ad458a522fc2 (patch) | |
| tree | 454d1f2a661f79d8561f9a936c7236e4b1cb807c /nixos | |
| parent | c57a912016025f66d666f0da26bc998b49ae55a7 (diff) | |
| download | nixlib-f0fd1c9bcfd745d3576dc8ca1357ad458a522fc2.tar nixlib-f0fd1c9bcfd745d3576dc8ca1357ad458a522fc2.tar.gz nixlib-f0fd1c9bcfd745d3576dc8ca1357ad458a522fc2.tar.bz2 nixlib-f0fd1c9bcfd745d3576dc8ca1357ad458a522fc2.tar.lz nixlib-f0fd1c9bcfd745d3576dc8ca1357ad458a522fc2.tar.xz nixlib-f0fd1c9bcfd745d3576dc8ca1357ad458a522fc2.tar.zst nixlib-f0fd1c9bcfd745d3576dc8ca1357ad458a522fc2.zip | |
nixos: iso-image: use memtest86 params in syslinux
See also #6593.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index c41d22ffd0d8..87e8fabe2730 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -46,6 +46,13 @@ let 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); # The efi boot image @@ -289,6 +296,10 @@ in { source = "${efiDir}/loader"; target = "/loader"; } + ] ++ optionals config.boot.loader.grub.memtest86.enable [ + { source = "${pkgs.memtest86plus}/memtest.bin"; + target = "/boot/memtest.bin"; + } ]; boot.loader.timeout = 10; |