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/modules/installer/tools | |
| 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/modules/installer/tools')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-prepare-root.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh index c374330f8464..cd786c47ef68 100644 --- a/nixos/modules/installer/tools/nixos-prepare-root.sh +++ b/nixos/modules/installer/tools/nixos-prepare-root.sh @@ -70,7 +70,7 @@ for i in $closures; do rsync -a $j $mountPoint/nix/store/ done - nix-store --register-validity < $i + nix-store --option build-users-group root --register-validity < $i fi done |