suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

nixos: remove rsync from base install and add explicit path in nixos-install

Browse Source 
As per 60b3f95ad8 (commitcomment-18507812)
This commit is contained in:
obadz 2016-08-07 01:25:06 +01:00
parent 57b7c3c545
commit 582313bafe
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/config/system-path.nix
View File

@ -34,7 +34,6 @@ let
config.programs.ssh.package config.programs.ssh.package
pkgs.perl pkgs.perl
pkgs.procps pkgs.procps
pkgs.rsync
pkgs.strace pkgs.strace
pkgs.su pkgs.su
pkgs.time pkgs.time

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

@ -175,7 +175,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";