haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #9012 from benh57/winssh_communicator_fix 

Fix guest network setup with winssh communicator
This commit is contained in:
Chris Roberts 2017-10-23 15:41:53 -07:00 committed by GitHub
parent 72ba63d2b9 ea518f6c78
commit 6eca74afc7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/guests/windows/guest_network.rb
View File

@ -64,7 +64,7 @@ module VagrantPlugins
def set_all_networks_to_work def set_all_networks_to_work
@logger.info("Setting all networks to 'Work Network'") @logger.info("Setting all networks to 'Work Network'")
command = File.read(File.expand_path("../scripts/set_work_network.ps1", __FILE__)) command = File.read(File.expand_path("../scripts/set_work_network.ps1", __FILE__))
@communicator.execute(command) @communicator.execute(command, { shell: :powershell })
end end
protected protected
@ -76,7 +76,7 @@ module VagrantPlugins
def wsman_version def wsman_version
@logger.debug("querying WSMan version") @logger.debug("querying WSMan version")
version = '' version = ''
@communicator.execute(PS_GET_WSMAN_VER) do |type, line| @communicator.execute(PS_GET_WSMAN_VER, { shell: :powershell }) do |type, line|
version = version + "#{line}" if type == :stdout && !line.nil? version = version + "#{line}" if type == :stdout && !line.nil?
end end
@logger.debug("wsman version: #{version}") @logger.debug("wsman version: #{version}")
@ -108,7 +108,7 @@ module VagrantPlugins
def network_adapters_v3_winrm def network_adapters_v3_winrm
command = File.read(File.expand_path("../scripts/winrs_v3_get_adapters.ps1", __FILE__)) command = File.read(File.expand_path("../scripts/winrs_v3_get_adapters.ps1", __FILE__))
output = "" output = ""
@communicator.execute(command) do |type, line| @communicator.execute(command, { shell: :powershell }) do |type, line|
output = output + "#{line}" if type == :stdout && !line.nil? output = output + "#{line}" if type == :stdout && !line.nil?
end end