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

Enable windows guest capabilities using winssh communicator

This commit is contained in:
Chris Roberts 2017-05-04 18:48:35 -07:00
parent 62edaf5623
commit ee79dd0575
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/guests/windows/cap/configure_networks.rb
View File

@ -9,10 +9,6 @@ module VagrantPlugins
@@logger = Log4r::Logger.new("vagrant::guest::windows::configure_networks") @@logger = Log4r::Logger.new("vagrant::guest::windows::configure_networks")
def self.configure_networks(machine, networks) def self.configure_networks(machine, networks)
if machine.config.vm.communicator != :winrm
raise Errors::NetworkWinRMRequired
end
@@logger.debug("Networks: #{networks.inspect}") @@logger.debug("Networks: #{networks.inspect}")
guest_network = GuestNetwork.new(machine.communicate) guest_network = GuestNetwork.new(machine.communicate)

2
plugins/guests/windows/cap/mount_shared_folder.rb
View File

@ -34,7 +34,7 @@ module VagrantPlugins
vm_provider_unc_path: vm_provider_unc_base + name, vm_provider_unc_path: vm_provider_unc_base + name,
}) })
if machine.config.vm.communicator == :winrm if machine.config.vm.communicator == :winrm || machine.config.vm.communicator == :winssh
machine.communicate.execute(script, shell: :powershell) machine.communicate.execute(script, shell: :powershell)
else else
# Convert script to double byte unicode string then base64 encode # Convert script to double byte unicode string then base64 encode

2
plugins/guests/windows/scripts/mount_volume.ps1.erb
View File

@ -28,7 +28,7 @@ if( (Test-Path "$MountPoint") -and (Test-ReparsePoint "$MountPoint") )
} }
elseif(Test-Path $MountPoint) elseif(Test-Path $MountPoint)
{ {
Write-Debug "Mount point already exists and is not a symbolic link" Write-Error "Mount point already exists and is not a symbolic link"
exit 1 exit 1
} }