Author: viric
Date: Mon Apr 9 20:36:26 2012
New Revision: 33692
URL: https://nixos.org/websvn/nix/?rev=33692&sc=1
Log:
Removing the special memtest.nix module for the isos, and using
the same as the usual nixos. I think this trivial change works;
I checked the grub.cfg output generated in the iso_minimal.
Deleted:
nixos/trunk/modules/installer/cd-dvd/memtest.nix
Modified:
nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix
Modified: nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix Mon Apr
9 20:30:14 2012 (r33691)
+++ nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix Mon Apr
9 20:36:26 2012 (r33692)
@@ -30,8 +30,7 @@
{
require =
- [ ./memtest.nix
- ./iso-image.nix
+ [ ./iso-image.nix
# Profiles of this basic installation CD.
../../profiles/all-hardware.nix
@@ -67,6 +66,8 @@
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 ];
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
