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

providers/virtualbox: fix broken NFS check

This commit is contained in:
Mitchell Hashimoto 2013-11-22 17:29:35 -08:00
parent 850c9ea7a6
commit 0b9861db7d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vagrant/action/builtin/synced_folders.rb
View File

@ -44,7 +44,7 @@ module Vagrant
if File.directory?(data[:hostpath]) if File.directory?(data[:hostpath])
data[:hostpath] = File.realpath(data[:hostpath]) data[:hostpath] = File.realpath(data[:hostpath])
data[:hostpath] = Util::Platform.fs_real_path(data[:hostpath]) data[:hostpath] = Util::Platform.fs_real_path(data[:hostpath]).to_s
end end
end end
end end

2
plugins/providers/virtualbox/action.rb
View File

@ -59,9 +59,9 @@ module VagrantPlugins
b.use PrepareForwardedPortCollisionParams b.use PrepareForwardedPortCollisionParams
b.use HandleForwardedPortCollisions b.use HandleForwardedPortCollisions
b.use PruneNFSExports b.use PruneNFSExports
b.use PrepareNFSSettings
b.use ClearSharedFolders b.use ClearSharedFolders
b.use SyncedFolders b.use SyncedFolders
b.use PrepareNFSSettings
b.use ClearNetworkInterfaces b.use ClearNetworkInterfaces
b.use Network b.use Network
b.use ForwardPorts b.use ForwardPorts

2
plugins/providers/virtualbox/action/prepare_nfs_settings.rb
View File

@ -12,7 +12,7 @@ module VagrantPlugins
using_nfs = false using_nfs = false
env[:machine].config.vm.synced_folders.each do |id, opts| env[:machine].config.vm.synced_folders.each do |id, opts|
if opts[:nfs] if opts[:type] == :nfs
using_nfs = true using_nfs = true
break break
end end