From 0b9861db7d777b4e14be8ca8aaf4a9b922383e7f Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 22 Nov 2013 17:29:35 -0800
Subject: [PATCH] providers/virtualbox: fix broken NFS check

---
 lib/vagrant/action/builtin/synced_folders.rb                | 2 +-
 plugins/providers/virtualbox/action.rb                      | 2 +-
 plugins/providers/virtualbox/action/prepare_nfs_settings.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/vagrant/action/builtin/synced_folders.rb b/lib/vagrant/action/builtin/synced_folders.rb
index 90c7ea1db..4daba7a28 100644
--- a/lib/vagrant/action/builtin/synced_folders.rb
+++ b/lib/vagrant/action/builtin/synced_folders.rb
@@ -44,7 +44,7 @@ module Vagrant
 
               if File.directory?(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
diff --git a/plugins/providers/virtualbox/action.rb b/plugins/providers/virtualbox/action.rb
index 706596198..6ea902976 100644
--- a/plugins/providers/virtualbox/action.rb
+++ b/plugins/providers/virtualbox/action.rb
@@ -59,9 +59,9 @@ module VagrantPlugins
           b.use PrepareForwardedPortCollisionParams
           b.use HandleForwardedPortCollisions
           b.use PruneNFSExports
-          b.use PrepareNFSSettings
           b.use ClearSharedFolders
           b.use SyncedFolders
+          b.use PrepareNFSSettings
           b.use ClearNetworkInterfaces
           b.use Network
           b.use ForwardPorts
diff --git a/plugins/providers/virtualbox/action/prepare_nfs_settings.rb b/plugins/providers/virtualbox/action/prepare_nfs_settings.rb
index 0aba7fdf0..03755707e 100644
--- a/plugins/providers/virtualbox/action/prepare_nfs_settings.rb
+++ b/plugins/providers/virtualbox/action/prepare_nfs_settings.rb
@@ -12,7 +12,7 @@ module VagrantPlugins
 
           using_nfs = false
           env[:machine].config.vm.synced_folders.each do |id, opts|
-            if opts[:nfs]
+            if opts[:type] == :nfs
               using_nfs = true
               break
             end