b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Again trying to get the kernelFile paths right

Browse source 
svn path=/nixos/branches/stdenv-updates/; revision=23836
This commit is contained in:
Lluís Batlle i Rossell 2010-09-17 17:25:46 +00:00
parent 743b75fbaf
commit c1e4586ed1
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/installer/cd-dvd/system-tarball-fuloong2f.nix
View file

@ -164,8 +164,8 @@ in
{ source = kernelParams;
target = "/kernelparams.txt";
}
{ source = config.boot.kernelPackages.kernel + config.system.boot.loader.kernelFile;
target = "/boot/vmlinux";
{ source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile;
target = "/boot/" + config.system.boot.loader.kernelFile;
}
{ source = nixpkgsUserConfig;
target = "/root/.nixpkgs/config.nix";
@ -183,7 +183,7 @@ in
boot.loader.grub.enable = false;
boot.loader.generationsDir.enable = false;
system.boot.loader.kernelFile = "/vmlinux";
system.boot.loader.kernelFile = "vmlinux";
# Needed for nixos to evaluate
system.build.menuBuilder = "true";

2
modules/installer/cd-dvd/system-tarball-pc.nix
View file

@ -171,7 +171,7 @@ in
tarball.storeContents = pkgs2storeContents [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
tarball.contents =
[ { source = config.boot.kernelPackages.kernel + config.system.boot.loader.kernelFile;
[ { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile;
target = "/boot/" + config.system.boot.loader.kernelFile;
}
];

6
modules/installer/cd-dvd/system-tarball-sheevaplug.nix
View file

@ -100,7 +100,7 @@ in
boot.loader.grub.enable = false;
boot.loader.generationsDir.enable = false;
system.boot.loader.kernelFile = "/uImage";
system.boot.loader.kernelFile = "uImage";
boot.initrd.availableKernelModules =
[ "mvsdio" "mmc_block" "reiserfs" "ext3" "ums-cypress" "rtc_mv"
@ -165,8 +165,8 @@ in
{ source = kernelParams;
target = "/kernelparams.txt";
}
{ source = config.boot.kernelPackages.kernel + config.system.boot.loader.kernelFile;
target = "/boot/uImage";
{ source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile;
target = "/boot/" + config.system.boot.loader.kernelFile;
}
{ source = pkgs.ubootSheevaplug;
target = "/boot/uboot";