ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Partially revert "Revert "nixos: remove rsync from base install and add explicit path in nixos-install""

Browse Source 
This partially reverts commit 0aa7520670.

Fine for rsync to be in system path but we still need the explicit path
in nixos-install in case it is invoked from non-NixOS systems and also
to fix OVA test failure

See also 0aa7520670

cc @edolstra
This commit is contained in:
obadz 2016-09-06 11:45:19 +01:00
parent e7afac83c9
commit 3f1ceae281
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/installer/tools/nixos-install.sh
View File

@ -169,7 +169,7 @@ if ! NIX_DB_DIR=$mountPoint/nix/var/nix/db nix-store --check-validity @nix@ 2> /
for i in $(@perl@/bin/perl @pathsFromGraph@ @nixClosure@); do for i in $(@perl@/bin/perl @pathsFromGraph@ @nixClosure@); do
echo " $i" echo " $i"
chattr -R -i $mountPoint/$i 2> /dev/null || true # clear immutable bit chattr -R -i $mountPoint/$i 2> /dev/null || true # clear immutable bit
rsync -a $i $mountPoint/nix/store/ @rsync@/bin/rsync -a $i $mountPoint/nix/store/
done done
# Register the paths in the Nix closure as valid. This is necessary # Register the paths in the Nix closure as valid. This is necessary

2
nixos/modules/installer/tools/tools.nix
View File

@ -21,7 +21,7 @@ let
name = "nixos-install"; name = "nixos-install";
src = ./nixos-install.sh; src = ./nixos-install.sh;
inherit (pkgs) perl pathsFromGraph; inherit (pkgs) perl pathsFromGraph rsync;
nix = config.nix.package.out; nix = config.nix.package.out;
cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
root_uid = config.ids.uids.root; root_uid = config.ids.uids.root;