From 171feb38cf0436607b17cdf6eb32e11d5f65fda3 Mon Sep 17 00:00:00 2001 From: Brian Pitts Date: Sun, 5 Jan 2014 18:18:42 -0600 Subject: [PATCH] Only use vagrant 1.4 nfs changes when running vagrant 1.4. --- lib/vagrant-libvirt/action.rb | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/vagrant-libvirt/action.rb b/lib/vagrant-libvirt/action.rb index 9edfee4..1f3547f 100644 --- a/lib/vagrant-libvirt/action.rb +++ b/lib/vagrant-libvirt/action.rb @@ -25,8 +25,12 @@ module VagrantPlugins b2.use CreateNetworks b2.use CreateNetworkInterfaces - b2.use SyncedFolderCleanup - b2.use SyncedFolders + if Vagrant::VERSION < "1.4.0" + b2.use NFS + else + b2.use SyncedFolderCleanup + b2.use SyncedFolders + end b2.use PrepareNFSSettings b2.use ShareFolders @@ -61,8 +65,12 @@ module VagrantPlugins # VM is not running or suspended. Start it.. Machine should gain # IP address when comming up, so wait for dhcp lease and store IP # into machines data_dir. - b3.use SyncedFolderCleanup - b3.use SyncedFolders + if Vagrant::VERSION < "1.4.0" + b3.use NFS + else + b3.use SyncedFolderCleanup + b3.use SyncedFolders + end b3.use PrepareNFSSettings b3.use ShareFolders @@ -305,8 +313,10 @@ module VagrantPlugins autoload :WaitTillUp, action_root.join('wait_till_up') autoload :SSHRun, 'vagrant/action/builtin/ssh_run' autoload :HandleBoxUrl, 'vagrant/action/builtin/handle_box_url' - autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders' - autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup' + unless Vagrant::VERSION < "1.4.0" + autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders' + autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup' + end end end end