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

Making the bootloaders respect the platform.kernelTarget set in nixpkgs.

Browse Source 
svn path=/nixos/trunk/; revision=20283
This commit is contained in:
Lluís Batlle i Rossell 2010-02-27 22:17:10 +00:00
parent 9002335101
commit b6090bff9d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/installer/generations-dir/generations-dir.nix
View File

@ -42,8 +42,7 @@ let
}; };
# Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
platform = (if pkgs ? platform then pkgs.platform else platform = pkgs.stdenv.platform;
{ name = "pc"; uboot = null; });
in in
{ {
require = [ require = [
@ -58,9 +57,6 @@ in
menuBuilder = generationsDirBuilder; menuBuilder = generationsDirBuilder;
}; };
boot.loader.id = "generationsDir"; boot.loader.id = "generationsDir";
boot.loader.kernelFile = ( boot.loader.kernelFile = platform.kernelTarget;
if (platform.name == "sheevaplug") then "uImage"
else if (platform.name == "versatileARM") then "zImage"
else "bzImage");
}; };
} }

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

@ -149,7 +149,7 @@ 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 = "bzImage"; 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 ];