diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-09-23 20:51:09 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-09-23 20:51:09 +0000 |
| commit | ff1a79ed883394113dc9d78d0f7ae32ca2eea914 (patch) | |
| tree | 296f6a72734909eef26b2bfef104f35983fdcbc9 /modules/system/activation/top-level.nix | |
| parent | 8b9f510b0866ad2d91139a09a7db35bdbf4af89b (diff) | |
| download | nixpkgs-ff1a79ed883394113dc9d78d0f7ae32ca2eea914.tar nixpkgs-ff1a79ed883394113dc9d78d0f7ae32ca2eea914.tar.gz nixpkgs-ff1a79ed883394113dc9d78d0f7ae32ca2eea914.tar.bz2 nixpkgs-ff1a79ed883394113dc9d78d0f7ae32ca2eea914.tar.lz nixpkgs-ff1a79ed883394113dc9d78d0f7ae32ca2eea914.tar.xz nixpkgs-ff1a79ed883394113dc9d78d0f7ae32ca2eea914.tar.zst nixpkgs-ff1a79ed883394113dc9d78d0f7ae32ca2eea914.zip | |
Fixing the top-level expression not to boot only from uImage, but keep on
booting vmlinuz in non armv5tel. svn path=/nixos/trunk/; revision=17393
Diffstat (limited to 'modules/system/activation/top-level.nix')
| -rw-r--r-- | modules/system/activation/top-level.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix index 96e9e289d30..19e737d0d42 100644 --- a/modules/system/activation/top-level.nix +++ b/modules/system/activation/top-level.nix @@ -32,11 +32,14 @@ let 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 - ln -s ${config.boot.kernelPackages.kernel}/uImage $out/kernel + ln -s ${kernelfile} $out/kernel if [ -n "$grub" ]; then ln -s $grub $out/grub fi |