vagrantup 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4881add7aaa87715f372cca6beebdd072a0d422d
-  data.tar.gz: 9c102ab6573bdc7c8f05dcf49023a8bd9c4b6b81
+  metadata.gz: e00fcfbb23193067c2a4afea59ae386dea208b0d
+  data.tar.gz: ca231121eaa851f69dfd8b360358bd4804b394ae
 SHA512:
-  metadata.gz: 0d75ceaa126d3c13f3a6d13b881848baa767349cb52e2f6a560d3bafe086dbef5c63c606d81b40464cd61aa7accddf6f3a6c6fdbd2513e9723ace275bea006dc
-  data.tar.gz: fbe6c996e33357870f7bc0ac42018c806c63ce60b93e151b7091d7b057fc67b17f4c7302e0d7f893aea2c4fd156c8c9170f8ebe913ada5ea50c22511ece05e58
+  metadata.gz: bd27ea5ad68e7fdc28fe857b0e0ee4c55dbdbf201169d5a046d11dde5153d2dbc5d0068afc0ada829dbcfbd6139634fea92486c0165f517e81920e4f4360518a
+  data.tar.gz: c224f537f42011a882d432fd6d14202958ab4f91af54c33256c4b57f4d37a20dfb559f4676d8b9aa04063631b110ef0eb7af366a57ef1f6f92589f2c4ab72fac

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Mitchell Hashimoto