Author: viric
Date: Tue Apr 10 21:18:48 2012
New Revision: 33734
URL: https://nixos.org/websvn/nix/?rev=33734&sc=1
Log:
Reverting 33692, because memtest in the iso was failing.
I set the grub entry for memtest to read "Memtest86", as suggested by Eelco.
I run:
svn merge -c -33692 ^/nixos/trunk
And edited the change a bit.
Added:
nixos/trunk/modules/installer/cd-dvd/memtest.nix
- copied, changed from r33691,
nixos/trunk/modules/installer/cd-dvd/memtest.nix
Modified:
nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix
nixos/trunk/modules/installer/cd-dvd/installation-cd-new-kernel.nix (props
changed)
nixos/trunk/modules/system/activation/top-level.nix (props changed)
Modified: nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix Tue Apr
10 21:17:43 2012 (r33733)
+++ nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix Tue Apr
10 21:18:48 2012 (r33734)
@@ -30,7 +30,8 @@
{
require =
- [ ./iso-image.nix
+ [ ./memtest.nix
+ ./iso-image.nix
# Profiles of this basic installation CD.
../../profiles/all-hardware.nix
@@ -66,8 +67,6 @@
echo 1 > /proc/sys/vm/overcommit_memory
'';
- boot.loader.grub.memtest86 = true;
-
# To speed up installation a little bit, include the complete stdenv
# in the Nix store on the CD.
isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
Copied and modified: nixos/trunk/modules/installer/cd-dvd/memtest.nix (from
r33691, nixos/trunk/modules/installer/cd-dvd/memtest.nix)
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/memtest.nix Mon Apr 9 20:30:14
2012 (r33691, copy source)
+++ nixos/trunk/modules/installer/cd-dvd/memtest.nix Tue Apr 10 21:18:48
2012 (r33734)
@@ -1,5 +1,4 @@
-# This module adds Memtest86 to the Grub boot menu on the CD. !!! It
-# would be nice if this also worked for normal configurations.
+# This module adds Memtest86 to the Grub boot menu on the CD.
{config, pkgs, ...}:
@@ -7,20 +6,18 @@
memtestPath = "/boot/memtest.bin";
- memtest86 = pkgs.memtest86;
-
in
{
boot.loader.grub.extraEntries =
''
- menuentry "${memtest86.name}" {
+ menuentry "Memtest86" {
linux16 ${memtestPath}
}
'';
isoImage.contents =
- [ { source = memtest86 + "/memtest.bin";
+ [ { source = pkgs.memtest86 + "/memtest.bin";
target = memtestPath;
}
];
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
