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

action/forward_ports.rb: Fix SSH tunnel spawning and PID tracking

Browse Source 
- Explicitly disable any SSH multiplexing here so PID tracking of
  tunnels works correctly.

- Using `exec ssh` in the spawn forces Ruby to use a subshell (as exec
  is a shell builtin) instead of spawning the ssh process directly, which
  results in getting the wrong (and dead, as the exec replaces the
  subshell) PID to track and clean up later.

- Run the ssh tunnel command on its own process group, essentially
  daemonizing it and keeping its PID intact even when `vagrant up` command
  is run on shell/consoles without an explicit TTY, such as Emacs Eshell.
This commit is contained in:
Zak B. Elep
2019-08-17 14:05:31 +08:00
parent aa7ea05540
commit 9e35ec2b05
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/vagrant-libvirt/action/forward_ports.rb
View File

@@ -98,6 +98,7 @@ module VagrantPlugins
Port=#{ssh_info[:port]} Port=#{ssh_info[:port]}
UserKnownHostsFile=/dev/null UserKnownHostsFile=/dev/null
ExitOnForwardFailure=yes ExitOnForwardFailure=yes
ControlMaster=no
StrictHostKeyChecking=no StrictHostKeyChecking=no
PasswordAuthentication=no PasswordAuthentication=no
ForwardX11=#{ssh_info[:forward_x11] ? 'yes' : 'no'} ForwardX11=#{ssh_info[:forward_x11] ? 'yes' : 'no'}
@@ -109,7 +110,7 @@ module VagrantPlugins
options += " -o ProxyCommand=\"#{ssh_info[:proxy_command]}\"" if machine.provider_config.connect_via_ssh options += " -o ProxyCommand=\"#{ssh_info[:proxy_command]}\"" if machine.provider_config.connect_via_ssh
# TODO: instead of this, try and lock and get the stdin from spawn... # TODO: instead of this, try and lock and get the stdin from spawn...
ssh_cmd = 'exec ' ssh_cmd = ''
if host_port <= 1024 if host_port <= 1024
@@lock.synchronize do @@lock.synchronize do
# TODO: add i18n # TODO: add i18n
@@ -127,7 +128,7 @@ module VagrantPlugins
log_file = ssh_forward_log_file(host_ip, host_port, log_file = ssh_forward_log_file(host_ip, host_port,
guest_ip, guest_port) guest_ip, guest_port)
@logger.info "Logging to #{log_file}" @logger.info "Logging to #{log_file}"
spawn(ssh_cmd, [:out, :err] => [log_file, 'w']) spawn(ssh_cmd, [:out, :err] => [log_file, 'w'], :pgroup => true)
end end
def ssh_forward_log_file(host_ip, host_port, guest_ip, guest_port) def ssh_forward_log_file(host_ip, host_port, guest_ip, guest_port)