From 3c0341b7be333e9c33337316fc457f28384f1960 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 12 Oct 2012 20:03:25 -0700 Subject: [PATCH] Disable DNS proxy for 12.10 too --- plugins/providers/virtualbox/action/sane_defaults.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/providers/virtualbox/action/sane_defaults.rb b/plugins/providers/virtualbox/action/sane_defaults.rb index 1ab0b00f7..64a17a409 100644 --- a/plugins/providers/virtualbox/action/sane_defaults.rb +++ b/plugins/providers/virtualbox/action/sane_defaults.rb @@ -29,13 +29,13 @@ module VagrantPlugins begin contents = File.read("/etc/resolv.conf") - if contents =~ /^nameserver 127\.0\.0\.1$/ or - contents =~ /^nameserver 127\.0\.1\.1$/ + if contents =~ /^nameserver 127\.0\.(0|1)\.1$/ # The use of both natdnsproxy and natdnshostresolver break on # Ubuntu 12.04 and 12.10 that uses resolvconf with localhost. When used # VirtualBox will give the client dns server 10.0.2.3, while # not binding to that address itself. Therefore disable this - # feature if host uses the resolvconf server 127.0.0.1 or 127.0.0.1 + # feature if host uses the resolvconf server 127.0.0.1 or + # 127.0.1.1 @logger.info("Disabling DNS proxy since resolv.conf contains 127.0.0.1 or 127.0.1.1") enable_dns_proxy = false end