lavabit · furlongm · Jul 9, 2019 · Aug 26, 2019 · Dec 16, 2020
diff --git a/http/generic.alpine310.vagrant.cfg b/http/generic.alpine310.vagrant.cfg
@@ -7,7 +7,6 @@ auto eth0
 iface eth0 inet dhcp
     hostname alpine310.localdomain
 "
-DNSOPTS="-d local -n 4.2.2.1 4.2.2.2 208.67.220.220"
 TIMEZONEOPTS="-z UTC"
 PROXYOPTS="none"
 APKREPOSOPTS="https://sjc.edge.kernel.org/alpine/v3.10/main"

diff --git a/http/generic.alpine35.vagrant.cfg b/http/generic.alpine35.vagrant.cfg
@@ -7,7 +7,6 @@ auto eth0
 iface eth0 inet dhcp
     hostname alpine35.localdomain
 "
-DNSOPTS="-d local -n 4.2.2.1 4.2.2.2 208.67.220.220"
 TIMEZONEOPTS="-z UTC"
 PROXYOPTS="none"
 APKREPOSOPTS="https://sjc.edge.kernel.org/alpine/v3.5/main"

diff --git a/http/generic.alpine36.vagrant.cfg b/http/generic.alpine36.vagrant.cfg
@@ -7,7 +7,6 @@ auto eth0
 iface eth0 inet dhcp
     hostname alpine36.localdomain
 "
-DNSOPTS="-d local -n 4.2.2.1 4.2.2.2 208.67.220.220"
 TIMEZONEOPTS="-z UTC"
 PROXYOPTS="none"
 APKREPOSOPTS="https://sjc.edge.kernel.org/alpine/v3.6/main"

diff --git a/http/generic.alpine37.vagrant.cfg b/http/generic.alpine37.vagrant.cfg
@@ -7,7 +7,6 @@ auto eth0
 iface eth0 inet dhcp
     hostname alpine37.localdomain
 "
-DNSOPTS="-d local -n 4.2.2.1 4.2.2.2 208.67.220.220"
 TIMEZONEOPTS="-z UTC"
 PROXYOPTS="none"
 APKREPOSOPTS="https://sjc.edge.kernel.org/alpine/v3.7/main"

diff --git a/http/generic.alpine38.vagrant.cfg b/http/generic.alpine38.vagrant.cfg
@@ -7,7 +7,6 @@ auto eth0
 iface eth0 inet dhcp
     hostname alpine38.localdomain
 "
-DNSOPTS="-d local -n 4.2.2.1 4.2.2.2 208.67.220.220"
 TIMEZONEOPTS="-z UTC"
 PROXYOPTS="none"
 APKREPOSOPTS="https://sjc.edge.kernel.org/alpine/v3.8/main"

diff --git a/http/generic.alpine39.vagrant.cfg b/http/generic.alpine39.vagrant.cfg
@@ -7,7 +7,6 @@ auto eth0
 iface eth0 inet dhcp
     hostname alpine39.localdomain
 "
-DNSOPTS="-d local -n 4.2.2.1 4.2.2.2 208.67.220.220"
 TIMEZONEOPTS="-z UTC"
 PROXYOPTS="none"
 APKREPOSOPTS="https://sjc.edge.kernel.org/alpine/v3.9/main"

diff --git a/http/generic.dragonflybsd5.vagrant.cfg b/http/generic.dragonflybsd5.vagrant.cfg
@@ -111,12 +111,6 @@ hostname="${HOSTNAME}"
 dumpdev="/dev/${DISK}s1b"
 EOF
 
-cat <<-EOF > /mnt/etc/resolv.conf
-nameserver 4.2.2.1
-nameserver 4.2.2.2
-nameserver 208.67.220.220
-EOF
-
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install sed
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install curl
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install sudo

diff --git a/http/generic.freebsd11.vagrant.cfg b/http/generic.freebsd11.vagrant.cfg
@@ -16,13 +16,6 @@ HOSTNAME=freebsd11.localdomain
 # Workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203777
 export nonInteractive="YES"
 
-#!/bin/sh
-cat <<EOF > /etc/resolv.conf
-nameserver 4.2.2.1
-nameserver 4.2.2.2
-nameserver 208.67.220.220
-EOF
-
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install sed
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install curl
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install sudo

diff --git a/http/generic.freebsd12.vagrant.cfg b/http/generic.freebsd12.vagrant.cfg
@@ -16,13 +16,6 @@ HOSTNAME=freebsd12.localdomain
 # Workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203777
 export nonInteractive="YES"
 
-#!/bin/sh
-cat <<EOF > /etc/resolv.conf
-nameserver 4.2.2.1
-nameserver 4.2.2.2
-nameserver 208.67.220.220
-EOF
-
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install sed
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install curl
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install sudo

diff --git a/http/generic.hardenedbsd11.vagrant.cfg b/http/generic.hardenedbsd11.vagrant.cfg
@@ -16,13 +16,6 @@ HOSTNAME=hardenedbsd11.localdomain
 # Workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203777
 export nonInteractive="YES"
 
-#!/bin/sh
-cat <<EOF > /etc/resolv.conf
-nameserver 4.2.2.1
-nameserver 4.2.2.2
-nameserver 208.67.220.220
-EOF
-
 mkdir -p /usr/local/etc/pkg/repos
 echo "FreeBSD: { enabled: yes }" > /usr/local/etc/pkg/repos/FreeBSD.conf
 

diff --git a/http/generic.hardenedbsd12.vagrant.cfg b/http/generic.hardenedbsd12.vagrant.cfg
@@ -16,13 +16,6 @@ HOSTNAME=hardenedbsd12.localdomain
 # Workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203777
 export nonInteractive="YES"
 
-#!/bin/sh
-cat <<EOF > /etc/resolv.conf
-nameserver 4.2.2.1
-nameserver 4.2.2.2
-nameserver 208.67.220.220
-EOF
-
 mkdir -p /usr/local/etc/pkg/repos
 echo "FreeBSD: { enabled: yes }" > /usr/local/etc/pkg/repos/FreeBSD.conf
 

diff --git a/http/magma.alpine35.vagrant.cfg b/http/magma.alpine35.vagrant.cfg
@@ -7,7 +7,6 @@ auto eth0
 iface eth0 inet dhcp
     hostname magma.builder
 "
-DNSOPTS="-d local -n 4.2.2.1 4.2.2.2 208.67.220.220"
 TIMEZONEOPTS="-z UTC"
 PROXYOPTS="none"
 APKREPOSOPTS="https://sjc.edge.kernel.org/alpine/v3.5/main"

diff --git a/http/magma.alpine36.vagrant.cfg b/http/magma.alpine36.vagrant.cfg
@@ -7,7 +7,6 @@ auto eth0
 iface eth0 inet dhcp
     hostname magma.builder
 "
-DNSOPTS="-d local -n 4.2.2.1 4.2.2.2 208.67.220.220"
 TIMEZONEOPTS="-z UTC"
 PROXYOPTS="none"
 APKREPOSOPTS="https://sjc.edge.kernel.org/alpine/v3.6/main"

diff --git a/http/magma.freebsd11.vagrant.cfg b/http/magma.freebsd11.vagrant.cfg
@@ -16,13 +16,6 @@ HOSTNAME=magma.builder
 # Workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203777
 export nonInteractive="YES"
 
-#!/bin/sh
-cat <<EOF > /etc/resolv.conf
-nameserver 4.2.2.1
-nameserver 4.2.2.2
-nameserver 208.67.220.220
-EOF
-
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install sed
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install curl
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install sudo

diff --git a/scripts/centos6/base.sh b/scripts/centos6/base.sh
@@ -33,9 +33,14 @@ error() {
         fi
 }
 
-# We setup permanently good DNS servers later, but we write these out directly here to make
-# sure there are good ones available for the package installlation tasks below.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n" > /etc/resolv.conf
+# Tell yum to retry 128 times before failing, so unattended installs don't skip packages when errors occur.
+printf "\nretries=128\nmetadata_expire=0\nmirrorlist_expire=0\n" >> /etc/yum.conf
+
+# Disable the broken repositories.
+truncate --size=0 /etc/yum.repos.d/CentOS-Media.repo /etc/yum.repos.d/CentOS-Vault.repo
+
+# Import the update key.
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6; error
 
 # Update the base install first.
 retry yum --assumeyes update; error

diff --git a/scripts/centos6/network.sh b/scripts/centos6/network.sh
@@ -26,9 +26,6 @@ retry() {
   return "${RESULT}"
 }
 
-# Ensure a nameserver is being used that won't return an IP for non-existent domain names.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n" > /etc/resolv.conf
-
 # Disable IPv6 or yum will resolve mirror names to IPv6 address and then fail to connect with them.
 sysctl net.ipv6.conf.all.disable_ipv6=1
 
@@ -74,13 +71,10 @@ if [ -f /etc/sysconfig/network-scripts/ifcfg-eth0 ]; then
   sed -i -e "/IPV6FORWARDING.*/d;$ a IPV6FORWARDING=no" /etc/sysconfig/network-scripts/ifcfg-eth0
   sed -i -e "/IPV6_AUTOTUNNEL.*/d;$ a IPV6_AUTOTUNNEL=no" /etc/sysconfig/network-scripts/ifcfg-eth0
 
-  # Ensure good DNS servers are being used, and NM will be in control.
+  # Ensure NM will be in control.
   sed -i -e "/NM_CONTROLLED/d" /etc/sysconfig/network-scripts/ifcfg-eth0
-  printf "PEERDNS=\"no\"\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
   printf "NM_CONTROLLED=\"yes\"\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
   printf "IPV4_FAILURE_FATAL=\"no\"\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
-  printf "DNS1=4.2.2.1\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
-  printf "DNS2=4.2.2.2\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
 fi
 
 # Depending on the kick start configuration, the NetworkManager may still

diff --git a/scripts/centos7/network.sh b/scripts/centos7/network.sh
@@ -1,8 +1,5 @@
 #!/bin/bash -eux
 
-# Ensure a nameserver is being used that won't return an IP for non-existent domain names.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n"> /etc/resolv.conf
-
 # Set the hostname, and then ensure it will resolve properly.
 if [[ "$PACKER_BUILD_NAME" =~ ^generic-centos7-(vmware|hyperv|libvirt|parallels|virtualbox)$ ]]; then
   printf "centos7.localdomain\n" > /etc/hostname

diff --git a/scripts/debian10/apt.sh b/scripts/debian10/apt.sh
@@ -38,9 +38,6 @@ error() {
 export DEBIAN_FRONTEND=noninteractive
 export DEBCONF_NONINTERACTIVE_SEEN=true
 
-# We handle name server setup later, but for now, we need to ensure valid resolvers are available.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n" > /etc/resolv.conf
-
 # If the apt configuration directory exists, we add our own config options.
 if [ -d /etc/apt/apt.conf.d/ ]; then
 

diff --git a/scripts/debian10/network.sh b/scripts/debian10/network.sh
@@ -56,16 +56,10 @@ printf "allow-hotplug eth0\n" >> /etc/network/interfaces
 printf "auto lo\n" >> /etc/network/interfaces
 printf "iface lo inet loopback\n" >> /etc/network/interfaces
 printf "iface eth0 inet dhcp\n" >> /etc/network/interfaces
-printf "dns-nameserver 4.2.2.1\n" >> /etc/network/interfaces
-printf "dns-nameserver 4.2.2.2\n" >> /etc/network/interfaces
-printf "dns-nameserver 208.67.220.220\n" >> /etc/network/interfaces
 
 # Adding a delay so dhclient will work properly.
 printf "pre-up sleep 2\n" >> /etc/network/interfaces
 
-# Ensure a nameserver is being used that won't return an IP for non-existent domain names.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n" > /etc/resolv.conf
-
 # Install ifplugd so we can monitor and auto-configure nics.
 retry apt-get --assume-yes install ifplugd resolvconf
 

diff --git a/scripts/debian8/apt.sh b/scripts/debian8/apt.sh
@@ -38,9 +38,6 @@ error() {
 export DEBIAN_FRONTEND=noninteractive
 export DEBCONF_NONINTERACTIVE_SEEN=true
 
-# We handle name server setup later, but for now, we need to ensure valid resolvers are available.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n" > /etc/resolv.conf
-
 # If the apt configuration directory exists, we add our own config options.
 if [ -d /etc/apt/apt.conf.d/ ]; then
 

diff --git a/scripts/debian8/network.sh b/scripts/debian8/network.sh
@@ -56,16 +56,10 @@ printf "allow-hotplug eth0\n" >> /etc/network/interfaces
 printf "auto lo\n" >> /etc/network/interfaces
 printf "iface lo inet loopback\n" >> /etc/network/interfaces
 printf "iface eth0 inet dhcp\n" >> /etc/network/interfaces
-printf "dns-nameserver 4.2.2.1\n" >> /etc/network/interfaces
-printf "dns-nameserver 4.2.2.2\n" >> /etc/network/interfaces
-printf "dns-nameserver 208.67.220.220\n" >> /etc/network/interfaces
 
 # Adding a delay so dhclient will work properly.
 printf "pre-up sleep 2\n" >> /etc/network/interfaces
 
-# Ensure a nameserver is being used that won't return an IP for non-existent domain names.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n" > /etc/resolv.conf
-
 # Install ifplugd so we can monitor and auto-configure nics.
 retry apt-get --assume-yes install ifplugd resolvconf
 

diff --git a/scripts/debian9/apt.sh b/scripts/debian9/apt.sh
@@ -37,9 +37,6 @@ error() {
 export DEBIAN_FRONTEND=noninteractive
 export DEBCONF_NONINTERACTIVE_SEEN=true
 
-# We handle name server setup later, but for now, we need to ensure valid resolvers are available.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n" > /etc/resolv.conf
-
 # If the apt configuration directory exists, we add our own config options.
 if [ -d /etc/apt/apt.conf.d/ ]; then
 

diff --git a/scripts/debian9/network.sh b/scripts/debian9/network.sh
@@ -56,16 +56,10 @@ printf "allow-hotplug eth0\n" >> /etc/network/interfaces
 printf "auto lo\n" >> /etc/network/interfaces
 printf "iface lo inet loopback\n" >> /etc/network/interfaces
 printf "iface eth0 inet dhcp\n" >> /etc/network/interfaces
-printf "dns-nameserver 4.2.2.1\n" >> /etc/network/interfaces
-printf "dns-nameserver 4.2.2.2\n" >> /etc/network/interfaces
-printf "dns-nameserver 208.67.220.220\n" >> /etc/network/interfaces
 
 # Adding a delay so dhclient will work properly.
 printf "pre-up sleep 2\n" >> /etc/network/interfaces
 
-# Ensure a nameserver is being used that won't return an IP for non-existent domain names.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n" > /etc/resolv.conf
-
 # Install ifplugd so we can monitor and auto-configure nics.
 retry apt-get --assume-yes install ifplugd resolvconf
 

diff --git a/scripts/fedora25/base.sh b/scripts/fedora25/base.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Ensure a nameserver is being used that won't return an IP for non-existent domain names.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n"> /etc/resolv.conf
-
 # Set the local hostname to resolve properly.
 printf "\n127.0.0.1	bazinga.localdomain\n\n" >> /etc/hosts
 
@@ -28,13 +25,6 @@ sed -i -e "/IPV6_PEERROUTES.*/d;$ a IPV6_PEERROUTES=no" /etc/sysconfig/network-s
 sed -i -e "/IPV6FORWARDING.*/d;$ a IPV6FORWARDING=no" /etc/sysconfig/network-scripts/ifcfg-eth0
 sed -i -e "/IPV6_AUTOTUNNEL.*/d;$ a IPV6_AUTOTUNNEL=no" /etc/sysconfig/network-scripts/ifcfg-eth0
 
-
-# Ensure good DNS servers are being used.
-if [ -f /etc/sysconfig/network-scripts/ifcfg-eth0 ]; then
-  printf "DNS1=4.2.2.1\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
-  printf "DNS2=4.2.2.2\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
-fi
-
 # Close a potential security hole.
 systemctl disable remote-fs.target
 

diff --git a/scripts/fedora26/base.sh b/scripts/fedora26/base.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Ensure a nameserver is being used that won't return an IP for non-existent domain names.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n"> /etc/resolv.conf
-
 # Set the local hostname to resolve properly.
 printf "\n127.0.0.1	bazinga.localdomain\n\n" >> /etc/hosts
 
@@ -28,13 +25,6 @@ sed -i -e "/IPV6_PEERROUTES.*/d;$ a IPV6_PEERROUTES=no" /etc/sysconfig/network-s
 sed -i -e "/IPV6FORWARDING.*/d;$ a IPV6FORWARDING=no" /etc/sysconfig/network-scripts/ifcfg-eth0
 sed -i -e "/IPV6_AUTOTUNNEL.*/d;$ a IPV6_AUTOTUNNEL=no" /etc/sysconfig/network-scripts/ifcfg-eth0
 
-
-# Ensure good DNS servers are being used.
-if [ -f /etc/sysconfig/network-scripts/ifcfg-eth0 ]; then
-  printf "DNS1=4.2.2.1\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
-  printf "DNS2=4.2.2.2\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
-fi
-
 # Close a potential security hole.
 systemctl disable remote-fs.target
 

diff --git a/scripts/fedora27/base.sh b/scripts/fedora27/base.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Ensure a nameserver is being used that won't return an IP for non-existent domain names.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n"> /etc/resolv.conf
-
 # Set the local hostname to resolve properly.
 printf "\n127.0.0.1	magma.builder\n\n" >> /etc/hosts
 
@@ -29,12 +26,6 @@ sed -i -e "/IPV6FORWARDING.*/d;$ a IPV6FORWARDING=no" /etc/sysconfig/network-scr
 sed -i -e "/IPV6_AUTOTUNNEL.*/d;$ a IPV6_AUTOTUNNEL=no" /etc/sysconfig/network-scripts/ifcfg-eth0
 
 
-# Ensure good DNS servers are being used.
-if [ -f /etc/sysconfig/network-scripts/ifcfg-eth0 ]; then
-  printf "DNS1=4.2.2.1\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
-  printf "DNS2=4.2.2.2\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
-fi
-
 # Close a potential security hole.
 systemctl disable remote-fs.target
 

diff --git a/scripts/fedora28/base.sh b/scripts/fedora28/base.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Ensure a nameserver is being used that won't return an IP for non-existent domain names.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n"> /etc/resolv.conf
-
 # Set the local hostname to resolve properly.
 printf "\n127.0.0.1	magma.builder\n\n" >> /etc/hosts
 
@@ -28,13 +25,6 @@ sed -i -e "/IPV6_PEERROUTES.*/d;$ a IPV6_PEERROUTES=no" /etc/sysconfig/network-s
 sed -i -e "/IPV6FORWARDING.*/d;$ a IPV6FORWARDING=no" /etc/sysconfig/network-scripts/ifcfg-eth0
 sed -i -e "/IPV6_AUTOTUNNEL.*/d;$ a IPV6_AUTOTUNNEL=no" /etc/sysconfig/network-scripts/ifcfg-eth0
 
-
-# Ensure good DNS servers are being used.
-if [ -f /etc/sysconfig/network-scripts/ifcfg-eth0 ]; then
-  printf "DNS1=4.2.2.1\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
-  printf "DNS2=4.2.2.2\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
-fi
-
 # Close a potential security hole.
 systemctl disable remote-fs.target
 

diff --git a/scripts/fedora29/base.sh b/scripts/fedora29/base.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Ensure a nameserver is being used that won't return an IP for non-existent domain names.
-printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n"> /etc/resolv.conf
-
 # Set the local hostname to resolve properly.
 printf "\n127.0.0.1	magma.builder\n\n" >> /etc/hosts
 
@@ -28,13 +25,6 @@ sed -i -e "/IPV6_PEERROUTES.*/d;$ a IPV6_PEERROUTES=no" /etc/sysconfig/network-s
 sed -i -e "/IPV6FORWARDING.*/d;$ a IPV6FORWARDING=no" /etc/sysconfig/network-scripts/ifcfg-eth0
 sed -i -e "/IPV6_AUTOTUNNEL.*/d;$ a IPV6_AUTOTUNNEL=no" /etc/sysconfig/network-scripts/ifcfg-eth0
 
-
-# Ensure good DNS servers are being used.
-if [ -f /etc/sysconfig/network-scripts/ifcfg-eth0 ]; then
-  printf "DNS1=4.2.2.1\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
-  printf "DNS2=4.2.2.2\n" >> /etc/sysconfig/network-scripts/ifcfg-eth0
-fi
-
 # Close a potential security hole.
 systemctl disable remote-fs.target