I update the name of the memtest entry in grub of the iso images,

because it can be overriden choosing another memtest86.

As an effect of a change in nixpgks, the isos will include
memtest86 4.0a instead of memtest86+ 4.20, only because the 
former is released later, and I deduce it should work better.


svn path=/nixos/trunk/; revision=33691
This commit is contained in:
Lluís Batlle i Rossell 2012-04-09 20:30:14 +00:00
parent 0b8b6616b6
commit 6e281e46b7
1 changed files with 4 additions and 2 deletions

View File

@ -7,18 +7,20 @@ let
memtestPath = "/boot/memtest.bin"; memtestPath = "/boot/memtest.bin";
memtest86 = pkgs.memtest86;
in in
{ {
boot.loader.grub.extraEntries = boot.loader.grub.extraEntries =
'' ''
menuentry "Memtest86+" { menuentry "${memtest86.name}" {
linux16 ${memtestPath} linux16 ${memtestPath}
} }
''; '';
isoImage.contents = isoImage.contents =
[ { source = pkgs.memtest86 + "/memtest.bin"; [ { source = memtest86 + "/memtest.bin";
target = memtestPath; target = memtestPath;
} }
]; ];