NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change proxy_command to use embedded OpenSSH functionality instead of (#1222)

Browse Source 
Solves vagrant not detecting end of ssh connection when a proxy is
used, described in #921

Allows ssh argument population to append arguments only when
respective values are not nil, avoiding creation of invalid
proxy_command when ssh-agent or ssh config based connections are used
This commit is contained in:
Darragh Bailey
2021-03-17 12:19:02 +00:00
committed by GitHub
parent c8c590f586
commit ba4235add9
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/vagrant-libvirt/provider.rb
View File

@@ -69,12 +69,11 @@ module VagrantPlugins
}
if @machine.provider_config.connect_via_ssh
ssh_info[:proxy_command] =
"ssh '#{@machine.provider_config.host}' " \
"-l '#{@machine.provider_config.username}' " \
"-i '#{@machine.provider_config.id_ssh_key_file}' " \
'nc %h %p'
proxy_command = "ssh '#{@machine.provider_config.host}' "
proxy_command << "-l '#{@machine.provider_config.username}' " if @machine.provider_config.username
proxy_command << "-i '#{@machine.provider_config.id_ssh_key_file}' " if @machine.provider_config.id_ssh_key_file
proxy_command << '-W %h:%p'
ssh_info[:proxy_command] = proxy_command
end
ssh_info