From 3f1ceae281b0800ab6e65342ae347edeae84cebb Mon Sep 17 00:00:00 2001 From: obadz Date: Tue, 6 Sep 2016 11:45:19 +0100 Subject: Partially revert "Revert "nixos: remove rsync from base install and add explicit path in nixos-install"" This partially reverts commit 0aa75206705afc71b991cceeede644c87088d583. 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 https://github.com/NixOS/nixpkgs/commit/0aa75206705afc71b991cceeede644c87088d583 cc @edolstra --- nixos/modules/installer/tools/nixos-install.sh | 2 +- nixos/modules/installer/tools/tools.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/modules') diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index f1d2e69b28cd..0a452b86018a 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -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 echo " $i" 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 # Register the paths in the Nix closure as valid. This is necessary diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index d73022698901..fc39a653abdc 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -21,7 +21,7 @@ let name = "nixos-install"; src = ./nixos-install.sh; - inherit (pkgs) perl pathsFromGraph; + inherit (pkgs) perl pathsFromGraph rsync; nix = config.nix.package.out; cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; root_uid = config.ids.uids.root; -- cgit 1.4.1