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

Reverting 33692, because memtest in the iso was failing.

Browse Source 
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.


svn path=/nixos/trunk/; revision=33734
This commit is contained in:
Lluís Batlle i Rossell 2012-04-10 21:18:48 +00:00
parent c02240082a
commit 2ca7e8a43e
2 changed files with 26 additions and 3 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,7 +30,8 @@ in
{ {
require = require =
[ ./iso-image.nix [ ./memtest.nix
./iso-image.nix
# Profiles of this basic installation CD. # Profiles of this basic installation CD.
../../profiles/all-hardware.nix ../../profiles/all-hardware.nix
@ -66,8 +67,6 @@ 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 ];

24
modules/installer/cd-dvd/memtest.nix Normal file
View File

@ -0,0 +1,24 @@
# This module adds Memtest86 to the Grub boot menu on the CD.
{config, pkgs, ...}:
let
memtestPath = "/boot/memtest.bin";
in
{
boot.loader.grub.extraEntries =
''
menuentry "Memtest86" {
linux16 ${memtestPath}
}
'';
isoImage.contents =
[ { source = pkgs.memtest86 + "/memtest.bin";
target = memtestPath;
}
];
}