vagrant: stop rsync from wiping changes from /vpp

*Fixes issue where any changes to the vpp directory withing vagrant
 are wiped if user reboots the vagrant vm
*Rsync will now only run if provisioning hasn't occured before

Change-Id: Ic29eb1321fba33e82df4075e7a95c96fa2e6739f
Signed-off-by: Padraig Connolly <padraig.connolly@intel.com>

diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile
index 1f8cf9a..9e03a84 100644 (file)
--- a/build-root/vagrant/Vagrantfile
+++ b/build-root/vagrant/Vagrantfile
@@ -62,26 +62,29 @@ Vagrant.configure(2) do |config|
 
   config.ssh.forward_agent = true
 
-  config.vm.synced_folder "../../", "/vpp", type: "rsync",
-   rsync__auto: false,
-   rsync__exclude: [
-    "build-root/build*/",
-    "build-root/install*/",
-    "build-root/images*/",
-    "build-root/*.deb",
-    "build-root/*.rpm",
-    "build-root/*.changes",
-    "build-root/python",
-    "build-root/deb/debian/*.dkms",
-    "build-root/deb/debian/*.install",
-    "build-root/deb/debian/changes",
-    "build-root/tools"]
-
   config.vm.provider "virtualbox" do |vb|
       vb.customize ["modifyvm", :id, "--ioapic", "on"]
       vb.memory = "#{vmram}"
       vb.cpus = "#{vmcpu}"
 
+      # rsync the vpp directory if provision hasn't happened yet
+      unless File.exist? (".vagrant/machines/default/virtualbox/action_provision")
+        config.vm.synced_folder "../../", "/vpp", type: "rsync",
+         rsync__auto: false,
+         rsync__exclude: [
+          "build-root/build*/",
+          "build-root/install*/",
+          "build-root/images*/",
+          "build-root/*.deb",
+          "build-root/*.rpm",
+          "build-root/*.changes",
+          "build-root/python",
+          "build-root/deb/debian/*.dkms",
+          "build-root/deb/debian/*.install",
+          "build-root/deb/debian/changes",
+          "build-root/tools"]
+      end
+
       #support for the SSE4.x instruction is required in some versions of VB.
       vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.1", "1"]
       vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.2", "1"]