Author: eelco
Date: Wed May 23 15:52:29 2012
New Revision: 34218
URL: https://nixos.org/websvn/nix/?rev=34218&sc=1
Log:
* Allow building with boot.loader.grub.enable set to "false".
Modified:
nixos/trunk/modules/installer/grub/grub.nix
nixos/trunk/modules/system/activation/top-level.nix
Modified: nixos/trunk/modules/installer/grub/grub.nix
==============================================================================
--- nixos/trunk/modules/installer/grub/grub.nix Wed May 23 15:40:31 2012
(r34217)
+++ nixos/trunk/modules/installer/grub/grub.nix Wed May 23 15:52:29 2012
(r34218)
@@ -206,7 +206,6 @@
# Common attribute for boot loaders so only one of them can be
# set at once.
system.boot.loader.id = "grub";
- system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget;
environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ];
Modified: nixos/trunk/modules/system/activation/top-level.nix
==============================================================================
--- nixos/trunk/modules/system/activation/top-level.nix Wed May 23 15:40:31
2012 (r34217)
+++ nixos/trunk/modules/system/activation/top-level.nix Wed May 23 15:52:29
2012 (r34218)
@@ -36,7 +36,7 @@
};
system.boot.loader.kernelFile = mkOption {
- default = "";
+ default = pkgs.stdenv.platform.kernelTarget;
description = ''
Name of the kernel file to be passed to the bootloader.
'';
@@ -152,7 +152,7 @@
inherit children;
kernelParams =
config.boot.kernelParams ++ config.boot.extraKernelParams;
- menuBuilder = config.system.build.menuBuilder;
+ menuBuilder = config.system.build.menuBuilder or "true";
initScriptBuilder = config.system.build.initScriptBuilder;
activationScript = config.system.activationScripts.script;
nixosVersion = config.system.nixosVersion;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
