about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-07-10T23·38-0400
committerGraham Christensen <graham@grahamc.com>2017-07-14T16·10-0400
commit6a4037ca05cdfd04e468115be1905eace8f6f57c (patch)
treef7e395f90736a0ce34d2e4dda41b50d82d4460bb
parent092f447c6d9034687e10b356939ed0482bf65ed8 (diff)
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.
-rw-r--r--scripts/install-darwin-multi-user.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh
index 95222a7f61ff..3901ebe2d601 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
 }