X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-root%2Fvagrant%2Fbootstrap.ubuntu1404.sh;h=d6729073abf77495a1c3ce75147938d61ea6af01;hb=1b1695316dab02fdbb626ca73ad61a92c31e417e;hp=89cd4e8eac48a61172bdcfeb8e6feaccc00935ec;hpb=b463ec886b6639cc072d7aaf584cffa23d9b6ea6;p=vpp.git

diff --git a/build-root/vagrant/bootstrap.ubuntu1404.sh b/build-root/vagrant/bootstrap.ubuntu1404.sh
index 89cd4e8eac4..d6729073abf 100644
--- 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 git-review
 
 # Install other stuff
 # apt-get install -y qemu-kvm libvirt-bin ubuntu-vm-builder bridge-utils
@@ -20,9 +23,6 @@ apt-get install -y openjdk-7-jdk
 # $$$ comment out for the moment
 # apt-get install -y --force-yes maven3
 
-# Install debian packaging tools
-apt-get install -y debhelper dkms
-
 # Setup for hugepages using upstart so it persists across reboots
 echo "vm.nr_hugepages=1024" >> /etc/sysctl.d/20-hugepages.conf
 sysctl --system
@@ -45,12 +45,23 @@ 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.
-sudo -H -u vagrant git clone /vpp
-cd vpp/
+sudo -u vagrant mkdir -p git/vpp
+cp /vagrant/README.moved git/vpp/
+
+# Disable all ethernet interfaces other than the default route
+# interface so VPP will use those interfaces.  The VPP auto-blacklist
+# algorithm prevents the use of any physical interface contained in the
+# routing table (i.e. "route --inet --inet6") preventing the theft of
+# the management ethernet interface by VPP from the kernel.
+for intf in $(ls /sys/class/net) ; do
+    if [ -d /sys/class/net/$intf/device ] && 
+        [ "$(route --inet --inet6 | grep default | grep $intf)" == "" ] ; then
+        ifconfig $intf down
+    fi
+done
+
+cd /vpp/
 
 # Initial vpp build
 if [ -d build-root ]; then