public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing the special memtest.nix module for the isos, and using

Browse Source 
the same as the usual nixos. I think this trivial change works;
I checked the grub.cfg output generated in the iso_minimal.


svn path=/nixos/trunk/; revision=33692
This commit is contained in:
Lluís Batlle i Rossell 2012-04-09 20:36:26 +00:00
parent 6e281e46b7
commit 9017ccf9fe
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -30,8 +30,7 @@ in
{ {
require = require =
[ ./memtest.nix [ ./iso-image.nix
./iso-image.nix
# Profiles of this basic installation CD. # Profiles of this basic installation CD.
../../profiles/all-hardware.nix ../../profiles/all-hardware.nix
@ -67,6 +66,8 @@ in
echo 1 > /proc/sys/vm/overcommit_memory echo 1 > /proc/sys/vm/overcommit_memory
''; '';
boot.loader.grub.memtest86 = true;
# To speed up installation a little bit, include the complete stdenv # To speed up installation a little bit, include the complete stdenv
# in the Nix store on the CD. # in the Nix store on the CD.
isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ]; isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];

27
modules/installer/cd-dvd/memtest.nix
View File

@ -1,27 +0,0 @@
# This module adds Memtest86 to the Grub boot menu on the CD. !!! It
# would be nice if this also worked for normal configurations.
{config, pkgs, ...}:
let
memtestPath = "/boot/memtest.bin";
memtest86 = pkgs.memtest86;
in
{
boot.loader.grub.extraEntries =
''
menuentry "${memtest86.name}" {
linux16 ${memtestPath}
}
'';
isoImage.contents =
[ { source = memtest86 + "/memtest.bin";
target = memtestPath;
}
];
}