From 83d012ba13c03ec373baa2b4cc0abbf8b6674e7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 16 Sep 2010 19:24:52 +0000
Subject: [PATCH] Trying to fix again system-tarball-pc (again, the kernel file
 name)

svn path=/nixos/branches/stdenv-updates/; revision=23824
---
 modules/installer/cd-dvd/system-tarball-pc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 0c0069c60582..49d0e4eea542 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -171,8 +171,8 @@ in
   tarball.storeContents = pkgs2storeContents [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
 
   tarball.contents =
-    [ { source = config.boot.kernelPackages.kernel + "/vmlinuz";
-        target = "/boot/vmlinuz";
+    [ { source = config.boot.kernelPackages.kernel + config.system.boot.loader.kernelFile;
+        target = "/boot/" + config.system.boot.loader.kernelFile;
       }
     ];