diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-04-17 03:08:37 +0000 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-04-24 02:30:00 +0000 |
| commit | f1708a9d7d79e2bf2961fc648625578b23b3460f (patch) | |
| tree | 03e922a61e33ec8cb7763d2c2b45541de8b51a67 /nixos/maintainers/scripts | |
| parent | 5c7f4669a7880bc2f929271ae4fdbdc2ba8e2a8b (diff) | |
| download | nixlib-f1708a9d7d79e2bf2961fc648625578b23b3460f.tar nixlib-f1708a9d7d79e2bf2961fc648625578b23b3460f.tar.gz nixlib-f1708a9d7d79e2bf2961fc648625578b23b3460f.tar.bz2 nixlib-f1708a9d7d79e2bf2961fc648625578b23b3460f.tar.lz nixlib-f1708a9d7d79e2bf2961fc648625578b23b3460f.tar.xz nixlib-f1708a9d7d79e2bf2961fc648625578b23b3460f.tar.zst nixlib-f1708a9d7d79e2bf2961fc648625578b23b3460f.zip | |
make-disk-image: change to be less VM-centric
This changes much of the make-disk-image.nix logic (and thus most NixOS image building) to use LKL to set up the target directory structure rather than a Linux VM. The only work we still do in a VM is less IO-heavy stuff that while still time-consuming, is less of the overall load. The goal is to kill more of that stuff, but that will require deeper changes to NixOS activation scripts and switch-to-configuration.pl, and I don't want to bite off too much at once.
Diffstat (limited to 'nixos/maintainers/scripts')
| -rw-r--r-- | nixos/maintainers/scripts/ec2/amazon-image.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index b4190df8335b..cdfac71634d4 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -6,10 +6,7 @@ let cfg = config.amazonImage; in { - imports = - [ ../../../modules/installer/cd-dvd/channel.nix - ../../../modules/virtualisation/amazon-image.nix - ]; + imports = [ ../../../modules/virtualisation/amazon-image.nix ]; options.amazonImage = { contents = mkOption { |