From ff1a79ed883394113dc9d78d0f7ae32ca2eea914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 23 Sep 2009 20:51:09 +0000
Subject: [PATCH] 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
---
 modules/system/activation/top-level.nix | 9 ++++++---
 1 file 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