mirror of
https://github.com/nix-community/nixos-anywhere.git
synced 2024-10-26 08:18:11 +03:00
Merge pull request #172 from numtide/rsync-ssh-args
also pass ssh_args to rsync
This commit is contained in:
commit
f1a76e0ee9
@ -242,7 +242,6 @@ elif [[ -n ${disko_script-} ]] && [[ -n ${nixos_system-} ]]; then
|
|||||||
if [[ ! -e ${disko_script} ]] || [[ ! -e ${nixos_system} ]]; then
|
if [[ ! -e ${disko_script} ]] || [[ ! -e ${nixos_system} ]]; then
|
||||||
abort "${disko_script} and ${nixos_system} must be existing store-paths"
|
abort "${disko_script} and ${nixos_system} must be existing store-paths"
|
||||||
fi
|
fi
|
||||||
:
|
|
||||||
else
|
else
|
||||||
abort "flake must be set"
|
abort "flake must be set"
|
||||||
fi
|
fi
|
||||||
@ -429,7 +428,10 @@ if [[ -n ${extra_files-} ]]; then
|
|||||||
extra_files="$extra_files/"
|
extra_files="$extra_files/"
|
||||||
fi
|
fi
|
||||||
step Copying extra files
|
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
|
ssh_ "chmod 755 /mnt" # rsync also changes permissions of /mnt
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user