From 95ab29b3db441fc7ff8f7051334f0c8f75f0137e Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Wed, 10 Feb 2016 22:14:27 -0500 Subject: [PATCH] only use controlmaster for non-windows platforms, resolves #6702 --- plugins/synced_folders/rsync/helper.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/synced_folders/rsync/helper.rb b/plugins/synced_folders/rsync/helper.rb index 495cb7e5d..5429a6b7c 100644 --- a/plugins/synced_folders/rsync/helper.rb +++ b/plugins/synced_folders/rsync/helper.rb @@ -69,14 +69,16 @@ module VagrantPlugins # Create the path for the control sockets. We used to do this # in the machine data dir but this can result in paths that are # too long for unix domain sockets. - controlpath = File.join(Dir.tmpdir, "ssh.#{rand(1000)}") + control_options = "" + unless Vagrant::Util::Platform.windows? + controlpath = File.join(Dir.tmpdir, "ssh.#{rand(1000)}") + control_options = "-o ControlMaster=auto -o ControlPath=#{controlpath} -o ControlPersist=10m" + end rsh = [ "ssh -p #{ssh_info[:port]} " + proxy_command + - "-o ControlMaster=auto " + - "-o ControlPath=#{controlpath} " + - "-o ControlPersist=10m " + + control_options + "-o StrictHostKeyChecking=no " + "-o IdentitiesOnly=true " + "-o UserKnownHostsFile=/dev/null",