vagrant 1.0.2 → 1.0.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.3 (May 1, 2012)
+
+  - Don't enable NAT DNS proxy on machines where resolv.conf already points
+    to localhost. This allows Vagrant to work once again with Ubuntu
+    12.04. [GH-909]
+
 ## 1.0.2 (March 25, 2012)
 
   - Provisioners will still mount folders and such if `--no-provision` is

data/lib/vagrant/action/vm/sane_defaults.rb

@@ -28,13 +28,34 @@ module Vagrant
           ]
           attempt_and_log(command, "Enabling the Host I/O cache on the SATA controller...")
 
-          # Enable the DNS proxy while in NAT mode.  This shields the guest
-          # VM from external DNS changs on the host machine.
-          command = [
-            "modifyvm", env[:vm].uuid,
-            "--natdnsproxy1", "on"
-          ]
-          attempt_and_log(command, "Enable the NAT DNS proxy on adapter 1...")
+          enable_dns_proxy = true
+          begin
+            contents = File.read("/etc/resolv.conf")
+
+            if contents =~ /^nameserver 127\.0\.0\.1$/
+              # The use of both natdnsproxy and natdnshostresolver break on
+              # Ubuntu 12.04 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
+              @logger.info("Disabling DNS proxy since resolv.conf contains 127.0.0.1")
+              enable_dns_proxy = false
+            end
+          rescue Errno::ENOENT; end
+
+          # Enable/disable the NAT DNS proxy as necessary
+          if enable_dns_proxy
+            command = [
+              "modifyvm", env[:vm].uuid,
+              "--natdnsproxy1", "on"
+            ]
+            attempt_and_log(command, "Enable the NAT DNS proxy on adapter 1...")
+          else
+            command = [ "modifyvm", env[:vm].uuid, "--natdnsproxy1", "off" ]
+            attempt_and_log(command, "Disable the NAT DNS proxy on adapter 1...")
+            command = [ "modifyvm", env[:vm].uuid, "--natdnshostresolver1", "off" ]
+            attempt_and_log(command, "Disable the NAT DNS resolver on adapter 1...")
+          end
 
           @app.call(env)
         end

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-25 00:00:00 Z
+date: 2012-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar