nix-community/nixos-anywhere
1
1
Fork 0
mirror of https://github.com/nix-community/nixos-anywhere.git synced 2024-10-03 19:27:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge #172

Browse Source 
172: also pass ssh_args to rsync r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
This commit is contained in:
bors[bot] 2023-08-11 06:00:33 +00:00 committed by GitHub
commit fc9b3a7a92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nixos-anywhere.sh
View File

@ -242,7 +242,6 @@ elif [[ -n ${disko_script-} ]] && [[ -n ${nixos_system-} ]]; then
if [[ ! -e ${disko_script} ]] || [[ ! -e ${nixos_system} ]]; then
abort "${disko_script} and ${nixos_system} must be existing store-paths"
fi
:
else
abort "flake must be set"
fi
@ -429,7 +428,10 @@ if [[ -n ${extra_files-} ]]; then
extra_files="$extra_files/"
fi
step Copying extra files
rsync -rlpv -FF -e "ssh -i \"$ssh_key_dir\"/nixos-anywhere -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" "$extra_files" "${ssh_connection}:/mnt/"
rsync -rlpv -FF \
-e "ssh -i \"$ssh_key_dir\"/nixos-anywhere -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ${ssh_args[*]}" \
"$extra_files" \
"${ssh_connection}:/mnt/"
ssh_ "chmod 755 /mnt" # rsync also changes permissions of /mnt
fi