diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-05 12:19:01 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-05 13:45:59 +0200 |
commit | 0aa75206705afc71b991cceeede644c87088d583 (patch) | |
tree | 6deb073e64a3de92a93c94481d922fdaadbb715f | |
parent | 8295089e6a08798f9cd733ee76e82d939d09faab (diff) | |
download | nixlib-0aa75206705afc71b991cceeede644c87088d583.tar nixlib-0aa75206705afc71b991cceeede644c87088d583.tar.gz nixlib-0aa75206705afc71b991cceeede644c87088d583.tar.bz2 nixlib-0aa75206705afc71b991cceeede644c87088d583.tar.lz nixlib-0aa75206705afc71b991cceeede644c87088d583.tar.xz nixlib-0aa75206705afc71b991cceeede644c87088d583.tar.zst nixlib-0aa75206705afc71b991cceeede644c87088d583.zip |
Revert "nixos: remove rsync from base install and add explicit path in nixos-install"
This reverts commit 582313bafef4c81cb6df2dcf2ece4757eb5c8082. Removing rsync is actually pointless because nixos-install depends on it. So if it's part of the system closure, we may as well provide it to users. Probably with the next Nix release we can drop the use of rsync and use "nix copy" instead.
-rw-r--r-- | nixos/modules/config/system-path.nix | 1 | ||||
-rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 2 | ||||
-rw-r--r-- | nixos/modules/installer/tools/tools.nix | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 169c86a2eae7..3587f8c643b0 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -34,6 +34,7 @@ let config.programs.ssh.package pkgs.perl pkgs.procps + pkgs.rsync pkgs.strace pkgs.su pkgs.time diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 0a452b86018a..f1d2e69b28cd 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@/bin/rsync -a $i $mountPoint/nix/store/ + 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 fc39a653abdc..d73022698901 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 rsync; + inherit (pkgs) perl pathsFromGraph; nix = config.nix.package.out; cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; root_uid = config.ids.uids.root; |