From a6892051efbc951b5278c3ca5ef022e506ff89ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 May 2012 15:52:29 +0000
Subject: [PATCH] * Allow building with boot.loader.grub.enable set to "false".

svn path=/nixos/trunk/; revision=34218
---
 modules/installer/grub/grub.nix         | 1 -
 modules/system/activation/top-level.nix | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 97e5f12d048..94522c3c059 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -206,7 +206,6 @@ in
     # 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 ];
 
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index dedfb9a9bd8..3edc92d502c 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -36,7 +36,7 @@ let
     };
 
     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 @@ let
     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;