alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Making also the system-tarball-pc show the memtest entry as the

Browse source 
pkgs.memtest86.name.


svn path=/nixos/trunk/; revision=33693
This commit is contained in:
Lluís Batlle i Rossell 2012-04-09 20:37:54 +00:00
parent 9017ccf9fe
commit 849d136aa6
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/installer/cd-dvd/system-tarball-pc.nix
View file

@ -32,7 +32,7 @@ let
append initrd=initrd ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init
label memtest
MENU LABEL ^Memtest86+
MENU LABEL ^${pkgs.memtest86.name}
KERNEL memtest
'';

7
modules/installer/grub/memtest.nix
View file

@ -1,10 +1,11 @@
# This module allows getting memtest86+ in grub menus.
# This module allows getting memtest86 in grub menus.
{config, pkgs, ...}:
with pkgs.lib;
let
isEnabled = config.boot.loader.grub.memtest86;
memtest86 = pkgs.memtest86;
in
{
options = {
@ -20,13 +21,13 @@ in
config.boot.loader.grub = mkIf isEnabled {
extraEntries =
''
menuentry "${pkgs.memtest86.name}" {
menuentry "${memtest86.name}" {
linux16 $bootRoot/memtest.bin
}
'';
extraPrepareConfig =
''
cp ${pkgs.memtest86}/memtest.bin /boot/memtest.bin;
cp ${memtest86}/memtest.bin /boot/memtest.bin;
'';
};
}