NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #115 from sciurus/guard_vagrant14_nfs_changes

Browse Source 
Only use vagrant 1.4 nfs changes when running vagrant 1.4.
This commit is contained in:
Dmitry Vasilets
2014-01-05 23:37:53 -08:00
parent c574f7ba34 171feb38cf
commit 14439fe569
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/vagrant-libvirt/action.rb
View File

@@ -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