Skip to content

Commit

Permalink
extra-files: use -p, -FF
Browse files Browse the repository at this point in the history
After removing -a in nix-community#15, remote extra files are implictly chowned
according to the remote umask. So we (re-)add --perms to apply local
file permissions remotely as this should mostly be expected behavior.

The second -F disables uploading the .rsync-filter file itself if it exists.
  • Loading branch information
phaer committed Jan 15, 2023
1 parent 066d9d8 commit 642551c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/nixos-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ if [[ -n ${extra_files:-} ]]; then
if [[ -d $extra_files ]]; then
extra_files="$extra_files/"
fi
rsync -vrlF -e "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" "$extra_files" "${ssh_connection}:/mnt/"
rsync -rlpv -FF -e "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" "$extra_files" "${ssh_connection}:/mnt/"
fi

ssh_ <<SSH
Expand Down

0 comments on commit 642551c

Please sign in to comment.