diff options
| author | obadz <obadz-git@obadz.com> | 2016-09-06 11:45:19 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-09-06 11:49:03 +0100 |
| commit | 3f1ceae281b0800ab6e65342ae347edeae84cebb (patch) | |
| tree | 0145bc3ac2b3980f02844ade59b91a6f47dffb62 /nixos | |
| parent | e7afac83c95c7ac03a1d82c5bdd94feebb44aec8 (diff) | |
| download | nixlib-3f1ceae281b0800ab6e65342ae347edeae84cebb.tar nixlib-3f1ceae281b0800ab6e65342ae347edeae84cebb.tar.gz nixlib-3f1ceae281b0800ab6e65342ae347edeae84cebb.tar.bz2 nixlib-3f1ceae281b0800ab6e65342ae347edeae84cebb.tar.lz nixlib-3f1ceae281b0800ab6e65342ae347edeae84cebb.tar.xz nixlib-3f1ceae281b0800ab6e65342ae347edeae84cebb.tar.zst nixlib-3f1ceae281b0800ab6e65342ae347edeae84cebb.zip | |
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
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 2 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/tools.nix | 2 |
2 files changed, 2 insertions, 2 deletions
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; |