From c1e4586ed1a7f68fc2e0de0f0df9f8c84f463fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 17 Sep 2010 17:25:46 +0000
Subject: [PATCH] Again trying to get the kernelFile paths right

svn path=/nixos/branches/stdenv-updates/; revision=23836
---
 modules/installer/cd-dvd/system-tarball-fuloong2f.nix  | 6 +++---
 modules/installer/cd-dvd/system-tarball-pc.nix         | 2 +-
 modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 127b6d30bc7..41386069e73 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -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";
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 49d0e4eea54..b81b7d5d0a9 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -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;
       }
     ];
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 5eb0cd503d7..f50d4353b34 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -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";