From 6a4037ca05cdfd04e468115be1905eace8f6f57c Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 10 Jul 2017 19:38:45 -0400 Subject: [PATCH] Don't install a second nix after the initial installation, and the rsync change fixes a bug hidden by the nix replacement where the store files were being owned by the installing user due to rsync's -a implying -og. --- scripts/install-darwin-multi-user.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh index 95222a7f6..3901ebe2d 100644 --- a/scripts/install-darwin-multi-user.sh +++ b/scripts/install-darwin-multi-user.sh @@ -637,7 +637,7 @@ install_from_extracted_nix() { cd "$EXTRACTED_NIX_PATH" _sudo "to copy the basic Nix files to the new store at $NIX_ROOT/store" \ - rsync -a "$(pwd)/store/" "$NIX_ROOT/store/" + rsync -rlpt "$(pwd)/store/" "$NIX_ROOT/store/" if [ -d "$NIX_INSTALLED_NIX" ]; then echo " Alright! We have our first nix at $NIX_INSTALLED_NIX" @@ -693,9 +693,6 @@ setup_default_profile() { _sudo "to update the default channel in the default profile" \ -i NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt "$NIX_INSTALLED_NIX/bin/nix-channel" --update nixpkgs - - _sudo "to replace the bootstrapping Nix with a real Nix" \ - -i NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt "$NIX_INSTALLED_NIX/bin/nix-env" -iA nixpkgs.nix }