diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2017-01-26 21:42:00 -0500 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2017-02-02 13:42:56 +0000 |
| commit | ed0e49c51841e84c72a5bb2c6d538ee779b734d4 (patch) | |
| tree | 7ad7c16dc967afd07f3a99ee6a436fe924407a87 /build-root/vagrant/run.sh | |
| parent | 460bc633b131d2001bb81d7c2ad5a51ec177ac93 (diff) | |
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>
Diffstat (limited to 'build-root/vagrant/run.sh')
| -rwxr-xr-x | build-root/vagrant/run.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/build-root/vagrant/run.sh b/build-root/vagrant/run.sh index 7342f38881e..1cd3382640a 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 |