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
2009-09-23 20:51:09 +00:00 · 2009-09-23 20:51:09 +00:00 · ff1a79ed88
commit ff1a79ed88
parent 8b9f510b08
1 changed files with 6 additions and 3 deletions
--- 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