Author: viric
Date: Mon Apr 9 20:37:54 2012
New Revision: 33693
URL: https://nixos.org/websvn/nix/?rev=33693&sc=1
Log:
Making also the system-tarball-pc show the memtest entry as the
pkgs.memtest86.name.
Modified:
nixos/trunk/modules/installer/cd-dvd/system-tarball-pc.nix
nixos/trunk/modules/installer/grub/memtest.nix
Modified: nixos/trunk/modules/installer/cd-dvd/system-tarball-pc.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/system-tarball-pc.nix Mon Apr 9
20:36:26 2012 (r33692)
+++ nixos/trunk/modules/installer/cd-dvd/system-tarball-pc.nix Mon Apr 9
20:37:54 2012 (r33693)
@@ -32,7 +32,7 @@
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
'';
Modified: nixos/trunk/modules/installer/grub/memtest.nix
==============================================================================
--- nixos/trunk/modules/installer/grub/memtest.nix Mon Apr 9 20:36:26
2012 (r33692)
+++ nixos/trunk/modules/installer/grub/memtest.nix Mon Apr 9 20:37:54
2012 (r33693)
@@ -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 @@
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;
'';
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
