From 850c9ea7a6be538f7ce9788f64c7437642c6de4e Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 22 Nov 2013 17:22:47 -0800 Subject: [PATCH] kernel: handle new NFS types --- plugins/kernel_v2/config/vm.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index 3be717eb0..845e5e191 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -294,9 +294,16 @@ module VagrantPlugins end @__synced_folders.each do |id, options| + if options[:nfs] + options[:type] = :nfs + end + + # Make sure the type is a symbol + options[:type] = options[:type].to_sym if options[:type] + # Ignore NFS on Windows - if options[:nfs] && Vagrant::Util::Platform.windows? - options[:nfs] = false + if options[:type] == :nfs && Vagrant::Util::Platform.windows? + options.delete(:type) end end @@ -381,7 +388,7 @@ module VagrantPlugins :path => options[:hostpath]) end - if options[:nfs] + if options[:type] == :nfs has_nfs = true if options[:owner] || options[:group]