diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-08-24 17:17:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 17:17:57 +0200 |
| commit | 7310a947517e5b7c7a19072918d0ededb204dec0 (patch) | |
| tree | ccb133b5dd4fc00f9f5afc2f04d443ded0724a3f | |
| parent | b63d68ad831a5a1b029aef20d051188084714635 (diff) | |
| parent | 697518d467f7f8263e2314c6fac59164d3ad300f (diff) | |
| download | nixlib-7310a947517e5b7c7a19072918d0ededb204dec0.tar nixlib-7310a947517e5b7c7a19072918d0ededb204dec0.tar.gz nixlib-7310a947517e5b7c7a19072918d0ededb204dec0.tar.bz2 nixlib-7310a947517e5b7c7a19072918d0ededb204dec0.tar.lz nixlib-7310a947517e5b7c7a19072918d0ededb204dec0.tar.xz nixlib-7310a947517e5b7c7a19072918d0ededb204dec0.tar.zst nixlib-7310a947517e5b7c7a19072918d0ededb204dec0.zip | |
Merge pull request #17960 from obadz/nixos-install-cleanup
nixos-install: remove manifest related stuff
| -rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 3b3a7bd27fe8..62ea98c4676c 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -136,7 +136,6 @@ fi mkdir -m 0755 -p \ $mountPoint/nix/var/nix/gcroots \ $mountPoint/nix/var/nix/temproots \ - $mountPoint/nix/var/nix/manifests \ $mountPoint/nix/var/nix/userpool \ $mountPoint/nix/var/nix/profiles \ $mountPoint/nix/var/nix/db \ @@ -201,14 +200,6 @@ p=@nix@/libexec/nix/substituters export NIX_SUBSTITUTERS=$p/copy-from-other-stores.pl:$p/download-from-binary-cache.pl -# Make manifests available in the chroot. -rm -f $mountPoint/nix/var/nix/manifests/* -for i in /nix/var/nix/manifests/*.nixmanifest; do - chroot $mountPoint @nix@/bin/nix-store -r "$(readlink -f "$i")" > /dev/null - cp -pd "$i" $mountPoint/nix/var/nix/manifests/ -done - - if [ -z "$closure" ]; then # Get the absolute path to the NixOS/Nixpkgs sources. nixpkgs="$(readlink -f $(nix-instantiate --find-file nixpkgs))" |