Author: viric
Date: Fri Sep 17 17:25:46 2010
New Revision: 23836
URL: https://svn.nixos.org/websvn/nix/?rev=23836&sc=1
Log:
Again trying to get the kernelFile paths right
Modified:
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-pc.nix
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
Modified:
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
==============================================================================
---
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
Fri Sep 17 17:21:56 2010 (r23835)
+++
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
Fri Sep 17 17:25:46 2010 (r23836)
@@ -164,8 +164,8 @@
{ 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 @@
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";
Modified:
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-pc.nix
==============================================================================
---
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-pc.nix
Fri Sep 17 17:21:56 2010 (r23835)
+++
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-pc.nix
Fri Sep 17 17:25:46 2010 (r23836)
@@ -171,7 +171,7 @@
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;
}
];
Modified:
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
==============================================================================
---
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
Fri Sep 17 17:21:56 2010 (r23835)
+++
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
Fri Sep 17 17:25:46 2010 (r23836)
@@ -100,7 +100,7 @@
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 @@
{ 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";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
