diff options
| author | markuskowa <markus.kowalewski@gmail.com> | 2019-10-07 10:16:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 10:16:50 +0200 |
| commit | 11e0b8465c747bcfca47249c803d4fc0fd25ad57 (patch) | |
| tree | 9323f2e8d8afab256a9e3e697662047d2bcbca69 | |
| parent | 4b4b80a68d9a7327a3a5346f0529051163a6d95e (diff) | |
| parent | e9bf955fd6d5ffda218878ba561c93c6a28dfe8e (diff) | |
| download | nixpkgs-11e0b8465c747bcfca47249c803d4fc0fd25ad57.tar nixpkgs-11e0b8465c747bcfca47249c803d4fc0fd25ad57.tar.gz nixpkgs-11e0b8465c747bcfca47249c803d4fc0fd25ad57.tar.bz2 nixpkgs-11e0b8465c747bcfca47249c803d4fc0fd25ad57.tar.lz nixpkgs-11e0b8465c747bcfca47249c803d4fc0fd25ad57.tar.xz nixpkgs-11e0b8465c747bcfca47249c803d4fc0fd25ad57.tar.zst nixpkgs-11e0b8465c747bcfca47249c803d4fc0fd25ad57.zip | |
Merge pull request #70027 from ck3d/fix-ova
make-disk-image: replace nixos-install by nix-env calls
| -rw-r--r-- | nixos/lib/make-disk-image.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 5e86ea479d5..de4aacf2319 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -180,9 +180,17 @@ let format' = format; in let export NIX_STATE_DIR=$TMPDIR/state nix-store --load-db < ${closureInfo}/registration - echo "running nixos-install..." - nixos-install --root $root --no-bootloader --no-root-passwd \ - --system ${config.system.build.toplevel} --channel ${channelSources} --substituters "" + mkdir -m 0755 -p "$root/etc" + touch "$root/etc/NIXOS" + + echo "copying system..." + nix-env --store "$root" --substituters "auto?trusted=1" \ + -p "$root/nix/var/nix/profiles/system" --set "${config.system.build.toplevel}" --quiet + + echo "copying channel..." + mkdir -p "$root/nix/var/nix/profiles/per-user/root" + nix-env --store "$root" --substituters "auto?trusted=1" \ + -p "$root/nix/var/nix/profiles/per-user/root/channels" --set "${channelSources}" --quiet echo "copying staging root to image..." cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / |