From ed0e49c51841e84c72a5bb2c6d538ee779b734d4 Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Thu, 26 Jan 2017 21:42:00 -0500
Subject: Update default Vagrant box to Ubuntu 16.04, VPP-616

- Make puppetlabs/ubuntu-16.04-64-nocm the default box
- Enable x11 forwarding
- Install x11-utils required for emacs to work over X11
- Refactor run.sh
- Add VPP_VAGRANT_POST_BUILD environment variable to
  allow selection of installing VPP or run "make test".
- Fix dependencies in src/vppapigen.am

Change-Id: I0ec054fdc83feb71ca8396df53ed02bf82ecd7e7
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---
 build-root/vagrant/run.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'build-root/vagrant/run.sh')

diff --git a/build-root/vagrant/run.sh b/build-root/vagrant/run.sh
index 7342f388..1cd33826 100755
--- a/build-root/vagrant/run.sh
+++ b/build-root/vagrant/run.sh
@@ -11,12 +11,13 @@ elif [ -f /etc/redhat-release ];then
     DISTRIB_DESCRIPTION=`lsb_release -sd`
 fi
 
-if [ $DISTRIB_ID == "Ubuntu" ]; then
-    start vpp
-elif [ $DISTRIB_ID == "CentOS" ]; then
+if [ $DISTRIB_ID == "CentOS" ]; then
     # Install uio-pci-generic
     modprobe uio_pci_generic
-
-    # Start vpp
+fi
+echo "Starting VPP..."
+if [ $DISTRIB_ID == "Ubuntu" ] && [ $DISTRIB_CODENAME = "trusty" ] ; then
+    start vpp
+else
     service vpp start
 fi
-- 
cgit 1.2.3-korg