public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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 append initrd=initrd ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init
label memtest label memtest
MENU LABEL ^Memtest86+ MENU LABEL ^${pkgs.memtest86.name}
KERNEL memtest 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, ...}: {config, pkgs, ...}:
with pkgs.lib; with pkgs.lib;
let let
isEnabled = config.boot.loader.grub.memtest86; isEnabled = config.boot.loader.grub.memtest86;
memtest86 = pkgs.memtest86;
in in
{ {
options = { options = {
@ -20,13 +21,13 @@ in
config.boot.loader.grub = mkIf isEnabled { config.boot.loader.grub = mkIf isEnabled {
extraEntries = extraEntries =
'' ''
menuentry "${pkgs.memtest86.name}" { menuentry "${memtest86.name}" {
linux16 $bootRoot/memtest.bin linux16 $bootRoot/memtest.bin
} }
''; '';
extraPrepareConfig = extraPrepareConfig =
'' ''
cp ${pkgs.memtest86}/memtest.bin /boot/memtest.bin; cp ${memtest86}/memtest.bin /boot/memtest.bin;
''; '';
}; };
} }