[DRE-commits] [vagrant-libvirt] 33/67: small fix for vagrant 1.4(not well tested but start working)

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to annotated tag 0.0.14
in repository vagrant-libvirt.

commit 6e3a9fe41171344f682a5b8e40961e987ce7458f
Author: dima <pronix.service at gmail.com>
Date:   Mon Dec 16 21:18:17 2013 +0100

    small fix for vagrant 1.4(not well tested but start working)
---
 lib/vagrant-libvirt/action.rb               | 9 +++++++--
 lib/vagrant-libvirt/action/share_folders.rb | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/vagrant-libvirt/action.rb b/lib/vagrant-libvirt/action.rb
index 1b9d955..9edfee4 100644
--- a/lib/vagrant-libvirt/action.rb
+++ b/lib/vagrant-libvirt/action.rb
@@ -25,7 +25,9 @@ module VagrantPlugins
               b2.use CreateNetworks
               b2.use CreateNetworkInterfaces
 
-              b2.use NFS
+              b2.use SyncedFolderCleanup
+              b2.use SyncedFolders
+
               b2.use PrepareNFSSettings
               b2.use ShareFolders
               b2.use SetHostname
@@ -59,7 +61,8 @@ 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 NFS
+              b3.use SyncedFolderCleanup
+              b3.use SyncedFolders
               b3.use PrepareNFSSettings
               b3.use ShareFolders
 
@@ -302,6 +305,8 @@ 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'
     end
   end
 end
diff --git a/lib/vagrant-libvirt/action/share_folders.rb b/lib/vagrant-libvirt/action/share_folders.rb
index e374295..027451a 100644
--- a/lib/vagrant-libvirt/action/share_folders.rb
+++ b/lib/vagrant-libvirt/action/share_folders.rb
@@ -1,4 +1,4 @@
-require "pathname"
+require 'pathname'
 
 require "log4r"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git