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

Fixing the top-level expression not to boot only from uImage, but keep on

Browse Source 
booting vmlinuz in non armv5tel.

svn path=/nixos/trunk/; revision=17393
This commit is contained in:
Lluís Batlle i Rossell 2009-09-23 20:51:09 +00:00
parent 8b9f510b08
commit ff1a79ed88
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,11 +32,14 @@ let
config.nesting.children; config.nesting.children;
systemBuilder = systemBuilder = let
'' kernelfile = if (pkgs.stdenv.system == "armv5tel-linux")
then "${config.boot.kernelPackages.kernel}/uImage"
else "${config.boot.kernelPackages.kernel}/vmlinuz";
in ''
ensureDir $out ensureDir $out
ln -s ${config.boot.kernelPackages.kernel}/uImage $out/kernel ln -s ${kernelfile} $out/kernel
if [ -n "$grub" ]; then if [ -n "$grub" ]; then
ln -s $grub $out/grub ln -s $grub $out/grub
fi fi