* system.build.system -> system.build.toplevel, since the former name

is just too weird.

svn path=/nixos/trunk/; revision=16954
This commit is contained in:
Eelco Dolstra 2009-09-04 09:29:18 +00:00
parent 9843fa2ed7
commit 685335df2f
5 changed files with 9 additions and 9 deletions

View file

@ -16,7 +16,7 @@ in
{ {
inherit eval config; inherit eval config;
system = config.system.build.system; system = config.system.build.toplevel;
vm = vmConfig.system.build.vm; vm = vmConfig.system.build.vm;

View file

@ -98,7 +98,7 @@ in
# script and the top-level system configuration directory. # script and the top-level system configuration directory.
isoImage.storeContents = isoImage.storeContents =
[ config.system.build.bootStage2 [ config.system.build.bootStage2
config.system.build.system config.system.build.toplevel
]; ];
# Create the squashfs image that contains the Nix store. # Create the squashfs image that contains the Nix store.
@ -137,7 +137,7 @@ in
# menu.lst. Break the cyclic dependency by having a /system # menu.lst. Break the cyclic dependency by having a /system
# symlink on the CD, and having menu.lst refer to /system. # symlink on the CD, and having menu.lst refer to /system.
source = pkgs.runCommand "system" {} source = pkgs.runCommand "system" {}
"ln -s ${config.system.build.system} $out"; "ln -s ${config.system.build.toplevel} $out";
target = "/system"; target = "/system";
} }
{ # Idem for the stage-2 init script. { # Idem for the stage-2 init script.

View file

@ -5,7 +5,7 @@
# Build the build-time dependencies of this configuration on the DVD # Build the build-time dependencies of this configuration on the DVD
# to speed up installation. # to speed up installation.
isoImage.storeContents = [config.system.build.system.drvPath]; isoImage.storeContents = [config.system.build.toplevel.drvPath];
# Include lots of packages. # Include lots of packages.
environment.systemPackages = environment.systemPackages =

View file

@ -92,5 +92,5 @@ let
in { in {
require = [options]; require = [options];
system.build.system = system; system.build.toplevel = system;
} }

View file

@ -48,10 +48,10 @@ let
-no-kvm-irqchip \ -no-kvm-irqchip \
-net nic,model=virtio -net user -smb / \ -net nic,model=virtio -net user -smb / \
-drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \ -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
-kernel ${config.system.build.system}/kernel \ -kernel ${config.system.build.toplevel}/kernel \
-initrd ${config.system.build.system}/initrd \ -initrd ${config.system.build.toplevel}/initrd \
$QEMU_OPTS \ $QEMU_OPTS \
-append "$(cat ${config.system.build.system}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.system} $QEMU_KERNEL_PARAMS" -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} $QEMU_KERNEL_PARAMS"
''; '';
in in
@ -122,7 +122,7 @@ in
system.build.vm = pkgs.runCommand "nixos-vm" {} system.build.vm = pkgs.runCommand "nixos-vm" {}
'' ''
ensureDir $out/bin ensureDir $out/bin
ln -s ${config.system.build.system} $out/system ln -s ${config.system.build.toplevel} $out/system
ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${vmName}-vm ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${vmName}-vm
''; '';