From 6325266097b1bfb0fcd09886b1dc636ed47bc84d Mon Sep 17 00:00:00 2001 From: Stanislav German-Evtushenko Date: Wed, 16 Mar 2016 11:07:03 +0900 Subject: [PATCH] Revert "Update resolv.conf to use 8.8.8.8" DNS configuration should not be hard-coded. This causes issues for those who have external DNS blocked for any reasons. This reverts commit d984f8c34ae14ca8f53e3b6266dfa7d3f0ecfe0b. Conflicts: packer/scripts/update-resolv.conf.sh templates/vmware.json --- packer/scripts/update-resolv.conf.sh | 6 ------ packer/templates/virtualbox.json | 1 - packer/templates/vmware.json | 1 - 3 files changed, 8 deletions(-) delete mode 100755 packer/scripts/update-resolv.conf.sh diff --git a/packer/scripts/update-resolv.conf.sh b/packer/scripts/update-resolv.conf.sh deleted file mode 100755 index 0d0d13ad..00000000 --- a/packer/scripts/update-resolv.conf.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -ex - -echo 'nameserver 8.8.8.8' >> /etc/resolvconf/resolv.conf.d/head -resolvconf -u diff --git a/packer/templates/virtualbox.json b/packer/templates/virtualbox.json index 1de9b901..6dc34711 100644 --- a/packer/templates/virtualbox.json +++ b/packer/templates/virtualbox.json @@ -64,7 +64,6 @@ "type": "shell", "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -S -E {{ .Path }}", "scripts": [ - "scripts/update-resolv.conf.sh", "scripts/quiet-tty-warning.sh", "scripts/apt-update.sh", "scripts/update-ruby.sh", diff --git a/packer/templates/vmware.json b/packer/templates/vmware.json index 3c1ad261..36ba762c 100644 --- a/packer/templates/vmware.json +++ b/packer/templates/vmware.json @@ -63,7 +63,6 @@ "type": "shell", "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -S -E {{ .Path }}", "scripts": [ - "scripts/update-resolv.conf.sh", "scripts/quiet-tty-warning.sh", "scripts/apt-update.sh", "scripts/update-ruby.sh",