public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Allow building with boot.loader.grub.enable set to "false".

Browse Source 
svn path=/nixos/trunk/; revision=34218
This commit is contained in:
Eelco Dolstra 2012-05-23 15:52:29 +00:00
parent 9dadfc3541
commit a6892051ef
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/installer/grub/grub.nix
View File

@ -206,7 +206,6 @@ in
# Common attribute for boot loaders so only one of them can be # Common attribute for boot loaders so only one of them can be
# set at once. # set at once.
system.boot.loader.id = "grub"; system.boot.loader.id = "grub";
system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget;
environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ]; environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ];

4
modules/system/activation/top-level.nix
View File

@ -36,7 +36,7 @@ let
}; };
system.boot.loader.kernelFile = mkOption { system.boot.loader.kernelFile = mkOption {
default = ""; default = pkgs.stdenv.platform.kernelTarget;
description = '' description = ''
Name of the kernel file to be passed to the bootloader. Name of the kernel file to be passed to the bootloader.
''; '';
@ -152,7 +152,7 @@ let
inherit children; inherit children;
kernelParams = kernelParams =
config.boot.kernelParams ++ config.boot.extraKernelParams; config.boot.kernelParams ++ config.boot.extraKernelParams;
menuBuilder = config.system.build.menuBuilder; menuBuilder = config.system.build.menuBuilder or "true";
initScriptBuilder = config.system.build.initScriptBuilder; initScriptBuilder = config.system.build.initScriptBuilder;
activationScript = config.system.activationScripts.script; activationScript = config.system.activationScripts.script;
nixosVersion = config.system.nixosVersion; nixosVersion = config.system.nixosVersion;