From 50f56a90ee5390021db813949efca1070faeb18e Mon Sep 17 00:00:00 2001 From: Chris Long Date: Sat, 9 May 2020 12:48:02 -0700 Subject: [PATCH 1/2] VMware Vagrant Utility 1.0.7 -> 1.0.9 --- ci/manual_machine_bootstrap_vmware.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/manual_machine_bootstrap_vmware.sh b/ci/manual_machine_bootstrap_vmware.sh index 1d5d584..eda191c 100644 --- a/ci/manual_machine_bootstrap_vmware.sh +++ b/ci/manual_machine_bootstrap_vmware.sh @@ -42,8 +42,8 @@ vagrant plugin install vagrant-reload vagrant plugin install vagrant-vmware-desktop echo $LICENSEFILE | base64 -d > /tmp/license.lic vagrant plugin license vagrant-vmware-desktop /tmp/license.lic -wget --progress=bar:force "https://releases.hashicorp.com/vagrant-vmware-utility/1.0.7/vagrant-vmware-utility_1.0.7_x86_64.deb" -dpkg -i vagrant-vmware-utility_1.0.7_x86_64.deb +wget --progress=bar:force "https://releases.hashicorp.com/vagrant-vmware-utility/1.0.9/vagrant-vmware-utility_1.0.9_x86_64.deb" +dpkg -i vagrant-vmware-utility_1.0.9_x86_64.deb # Make the Vagrant instances headless cd /opt/DetectionLab/Vagrant || exit 1 From 5398841cfeeb16b2404534d528a332a77eca8b5c Mon Sep 17 00:00:00 2001 From: Chris Long Date: Sat, 9 May 2020 13:38:57 -0700 Subject: [PATCH 2/2] Update bootstrap.sh --- Vagrant/bootstrap.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Vagrant/bootstrap.sh b/Vagrant/bootstrap.sh index bd98ccb..35ccaed 100644 --- a/Vagrant/bootstrap.sh +++ b/Vagrant/bootstrap.sh @@ -1,8 +1,10 @@ #! /bin/bash -# Override existing DNS Settings -echo -e " eth1:\n dhcp4: true\n nameservers:\n addresses: [8.8.8.8,8.8.4.4]" >> /etc/netplan/01-netcfg.yaml -netplan apply +# Override existing DNS Settings using netplan, but don't do it for Terraform builds +if ! curl -s 169.254.169.254 --connect-timeout 2 >/dev/null; then + echo -e " eth1:\n dhcp4: true\n nameservers:\n addresses: [8.8.8.8,8.8.4.4]" >> /etc/netplan/01-netcfg.yaml + netplan apply +fi sed -i 's/nameserver 127.0.0.53/nameserver 8.8.8.8/g' /etc/resolv.conf && chattr +i /etc/resolv.conf # Get a free Maxmind license here: https://www.maxmind.com/en/geolite2/signup