Author: viric
Date: Mon Apr 9 20:30:14 2012
New Revision: 33691
URL: https://nixos.org/websvn/nix/?rev=33691&sc=1
Log:
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.
Modified:
nixos/trunk/modules/installer/cd-dvd/memtest.nix
Modified: nixos/trunk/modules/installer/cd-dvd/memtest.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/memtest.nix Mon Apr 9 20:08:14
2012 (r33690)
+++ nixos/trunk/modules/installer/cd-dvd/memtest.nix Mon Apr 9 20:30:14
2012 (r33691)
@@ -7,18 +7,20 @@
memtestPath = "/boot/memtest.bin";
+ memtest86 = pkgs.memtest86;
+
in
{
boot.loader.grub.extraEntries =
''
- menuentry "Memtest86+" {
+ menuentry "${memtest86.name}" {
linux16 ${memtestPath}
}
'';
isoImage.contents =
- [ { source = pkgs.memtest86 + "/memtest.bin";
+ [ { source = memtest86 + "/memtest.bin";
target = memtestPath;
}
];
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
