summaryrefslogtreecommitdiffstats
path: root/extras/vagrant/install.sh
diff options
context:
space:
mode:
authorKyle Mestery <mestery@mestery.com>2018-08-10 16:32:13 -0500
committerDave Barach <openvpp@barachs.net>2018-08-14 20:16:51 +0000
commitacc1fbcb5e13961c1fcf1a00952b19b154b296b6 (patch)
tree3b67148a2b99a0a938dd766cfbf90b4009052851 /extras/vagrant/install.sh
parentce96dda4478d8a9ee3e3a6646c3367eb20263e3f (diff)
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 <mestery@mestery.com>
Diffstat (limited to 'extras/vagrant/install.sh')
-rwxr-xr-x[-rw-r--r--]extras/vagrant/install.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/extras/vagrant/install.sh b/extras/vagrant/install.sh
index a53faa4dd73..cfe5fe5b2d0 100644..100755
--- 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