diff options
Diffstat (limited to 'extras/vagrant')
| -rw-r--r-- | extras/vagrant/Vagrantfile | 3 | ||||
| -rwxr-xr-x | extras/vagrant/build.sh | 2 | ||||
| -rwxr-xr-x | extras/vagrant/run.sh | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/extras/vagrant/Vagrantfile b/extras/vagrant/Vagrantfile index a97a3dc38fc..8a2454ae0af 100644 --- a/extras/vagrant/Vagrantfile +++ b/extras/vagrant/Vagrantfile @@ -9,9 +9,6 @@ Vagrant.configure(2) do |config| config.vm.box = "centos/7" config.vm.box_version = "1708.01" config.ssh.insert_key = false - elsif distro == 'opensuse' - config.vm.box = "opensuse/openSUSE-42.3-x86_64" - config.vm.box_version = "1.0.4.20170726" elsif distro == 'ubuntu1804' config.vm.box = "bento/ubuntu-18.04" else diff --git a/extras/vagrant/build.sh b/extras/vagrant/build.sh index 3a10e707fb9..ea32ffe90c3 100755 --- a/extras/vagrant/build.sh +++ b/extras/vagrant/build.sh @@ -66,7 +66,5 @@ elif [ "$OS_ID" == "debian" ]; then elif [ "$OS_ID" == "centos" ]; then (cd $VPP_DIR/vnet ;$SUDOCMD aclocal;$SUDOCMD automake -a) $SUDOCMD make pkg-rpm -elif [ "$OS_ID" == "opensuse" ]; then - $SUDOCMD make pkg-rpm fi diff --git a/extras/vagrant/run.sh b/extras/vagrant/run.sh index 61c9261fe2f..3e87e259442 100755 --- a/extras/vagrant/run.sh +++ b/extras/vagrant/run.sh @@ -1,16 +1,16 @@ #!/bin/bash # Figure out what system we are running on -if [ "$(uname)" <> "Darwin" ]; then +if [ "$(uname)" <> "Darwin" ] ; then OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') fi -if [ "$OS_ID" == "ubuntu" ]; then +if [ "$OS_ID" == "ubuntu" ] ; then $OS_CODENAME=$UBUNTU_CODENAME fi -if [ "$OS_ID" == "centos" ] || [ "$OS_ID" == "opensuse" ]; then +if [ "$OS_ID" == "centos" ] ; then # Install uio-pci-generic sudo -E modprobe uio_pci_generic fi |