diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2017-02-12 21:37:30 -0500 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2017-02-14 15:57:03 +0000 |
| commit | 149745f95eec5b2e88685d0b08993d0f977f5935 (patch) | |
| tree | 5102b2967e5b55278c94198a2e25dbac878a9910 /build-root/vagrant/run.sh | |
| parent | 0debfb1fa2be7fd736f9202b6c7946ef19465dd1 (diff) | |
Update default Vagrant box to Ubuntu 16.04, VPP-616
- Hand merge of ed0e49c5 and 46f133d5 into stable/1701
Change-Id: Ib7260f07d22e546c6a92fb713b61b7e5edf247c9
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 |