Vagrantfile doesn't rm git/vpp and vagrant reload --provision

[vpp.git] / build-root / vagrant / bootstrap.ubuntu1404.sh

diff --git a/build-root/vagrant/bootstrap.ubuntu1404.sh b/build-root/vagrant/bootstrap.ubuntu1404.sh
index 89cd4e8..35865fa 100644 (file)
--- a/build-root/vagrant/bootstrap.ubuntu1404.sh
+++ b/build-root/vagrant/bootstrap.ubuntu1404.sh
@@ -1,3 +1,6 @@
+# Fix grub-pc on Virtualbox with Ubuntu
+export DEBIAN_FRONTEND=noninteractive
+
 # Standard update + upgrade dance
 apt-get update
 apt-get upgrade -y
@@ -7,7 +10,7 @@ apt-get upgrade -y
 sudo update-alternatives --install /bin/sh sh /bin/bash 100
 
 # Install build tools
-apt-get install -y build-essential autoconf automake bison libssl-dev ccache libtool git dkms debhelper
+apt-get install -y build-essential autoconf automake bison libssl-dev ccache libtool git dkms debhelper emacs libganglia1-dev libapr1-dev libconfuse-dev
 
 # Install other stuff
 # apt-get install -y qemu-kvm libvirt-bin ubuntu-vm-builder bridge-utils
@@ -45,10 +48,12 @@ start hugepages
 
 # Setup the vpp code
 cd ~vagrant/
+
 sudo -u vagrant mkdir git
 cd git/
 
-# You will need to alter this line to reflect reality.
+# Check if git exists and remove it before attempting clone, else clone ineffective when "reload --provision"
+[ -d vpp ] && rm -rf vpp
 sudo -H -u vagrant git clone /vpp
 cd vpp/