diff options
| author |   Marco Varlese <marco.varlese@suse.com> | 2017-10-06 15:07:08 +0200 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2017-10-09 02:41:01 +0000 |
| commit | c2e63feb6209ef504753fe2c975cf61b1c31b5cf (patch) | |
| tree | 3e7d73fd78cd195c8e5d7c43d4c51a1d8707e83e /extras/vagrant/update.sh | |
| parent | e9aebf9db548b940c77f7c5826a1260d1931e75d (diff) | |
Allow use of /etc/os-release file
The top-level Makefile in VPP already uses the file /etc/os-release to
recognize which OS the build is being performed on.
The scripts for vagrant images instead were still using different files
for different distros and adding a new distro to be supported causes
issues with the extra-logic to deal with it.
This patch aligns the vagrant scripts to use the same approach followed
by the top-level Makefile and simplifies the steps to identify / update
the OS and build / run VPP.
Change-Id: I539f4a7c27b3fef70ed1c12b0276049bc47dc289
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
Diffstat (limited to 'extras/vagrant/update.sh')
| -rwxr-xr-x | extras/vagrant/update.sh | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/extras/vagrant/update.sh b/extras/vagrant/update.sh index b4962bfc313..18bc25736a1 100755 --- a/extras/vagrant/update.sh +++ b/extras/vagrant/update.sh @@ -12,19 +12,13 @@ if [ $HUGEPAGES != 1024 ]; then exit fi -# Figure out what system we are running on -if [ -f /etc/lsb-release ];then - . /etc/lsb-release -elif [ -f /etc/redhat-release ];then - yum install -y redhat-lsb - DISTRIB_ID=`lsb_release -si` - DISTRIB_RELEASE=`lsb_release -sr` - DISTRIB_CODENAME=`lsb_release -sc` - DISTRIB_DESCRIPTION=`lsb_release -sd` +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 # Do initial setup for the system -if [ $DISTRIB_ID == "Ubuntu" ]; then +if [ "$OS_ID" == "ubuntu" ]; then export DEBIAN_PRIORITY=critical export DEBIAN_FRONTEND=noninteractive @@ -41,7 +35,7 @@ if [ $DISTRIB_ID == "Ubuntu" ]; then # Install useful but non-mandatory tools apt-get install -y emacs x11-utils git-review gdb gdbserver xfce4-terminal iperf3 -elif [ $DISTRIB_ID == "CentOS" ]; then +elif [ "$OS_ID" == "centos" ]; then if [ "$(echo $DISTRIB_RELEASE | cut -d'.' -f1)" == "7" ]; then rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm yum groupinstall "X Window system" -y @@ -50,4 +44,8 @@ elif [ $DISTRIB_ID == "CentOS" ]; then # Standard update + upgrade dance yum check-update yum update -y +elif [ "$OS_ID" == "opensuse" ]; then + zypper update -y + # NASM >= 2.12 is not available in previous openSUSE release; need to install it from TW + zypper install -y https://download.opensuse.org/tumbleweed/repo/oss/suse/x86_64/nasm-2.13.01-2.1.x86_64.rpm fi |