From acc1fbcb5e13961c1fcf1a00952b19b154b296b6 Mon Sep 17 00:00:00 2001 From: Kyle Mestery Date: Fri, 10 Aug 2018 16:32:13 -0500 Subject: Make vagrant work behind a proxy Without this change, I cannot get the in-tree VPP Vagrant to work behind a proxy. This commit fixes that by ensuring when we run sudo we're passing environment variables, amongst some other cleanups. Change-Id: Ica98a1238d40e6e6ccf80c472f52559c95af52f0 Signed-off-by: Kyle Mestery --- extras/vagrant/install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 extras/vagrant/install.sh (limited to 'extras/vagrant/install.sh') diff --git a/extras/vagrant/install.sh b/extras/vagrant/install.sh old mode 100644 new mode 100755 index a53faa4dd73..cfe5fe5b2d0 --- a/extras/vagrant/install.sh +++ b/extras/vagrant/install.sh @@ -12,7 +12,7 @@ fi if [ -f /etc/lsb-release ];then . /etc/lsb-release elif [ -f /etc/redhat-release ];then - sudo yum install -y redhat-lsb + sudo -E yum install -y redhat-lsb DISTRIB_ID=`lsb_release -si` DISTRIB_RELEASE=`lsb_release -sr` DISTRIB_CODENAME=`lsb_release -sc` @@ -24,7 +24,7 @@ echo DISTRIB_CODENAME: $DISTRIB_CODENAME echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION if [ $DISTRIB_ID == "Ubuntu" ]; then - (cd ${VPP_DIR}/build-root/;sudo dpkg -i *.deb) + (cd ${VPP_DIR}/build-root/;sudo -E dpkg -i *.deb) elif [ $DISTRIB_ID == "CentOS" ]; then - (cd ${VPP_DIR}/build-root/;sudo rpm -Uvh *.rpm) -fi \ No newline at end of file + (cd ${VPP_DIR}/build-root/;sudo -E rpm -Uvh *.rpm) +fi -- cgit 1.2.3-korg