Author: viric
Date: Tue Apr 10 22:20:20 2012
New Revision: 33739
URL: https://nixos.org/websvn/nix/?rev=33739&sc=1
Log:
I think this makes the memtest module work on grub1.
But I can't test it because grub-install fails for me for grub1.
I tested it works for grub2.
Modified:
nixos/trunk/modules/installer/grub/memtest.nix
Modified: nixos/trunk/modules/installer/grub/memtest.nix
==============================================================================
--- nixos/trunk/modules/installer/grub/memtest.nix Tue Apr 10 22:17:37
2012 (r33738)
+++ nixos/trunk/modules/installer/grub/memtest.nix Tue Apr 10 22:20:20
2012 (r33739)
@@ -19,11 +19,16 @@
};
config.boot.loader.grub = mkIf isEnabled {
- extraEntries =
+ extraEntries = if config.boot.loader.grub.version == 2 then
''
menuentry "${memtest86.name}" {
linux16 $bootRoot/memtest.bin
}
+ ''
+ else
+ ''
+ menuentry "${memtest86.name}"
+ linux16 $bootRoot/memtest.bin
'';
extraPrepareConfig =
''
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
