vagrantup 1.0.2 → 1.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -0
- data/lib/vagrant/action/vm/sane_defaults.rb +28 -7
- data/lib/vagrant/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e00fcfbb23193067c2a4afea59ae386dea208b0d
|
|
4
|
+
data.tar.gz: ca231121eaa851f69dfd8b360358bd4804b394ae
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bd27ea5ad68e7fdc28fe857b0e0ee4c55dbdbf201169d5a046d11dde5153d2dbc5d0068afc0ada829dbcfbd6139634fea92486c0165f517e81920e4f4360518a
|
|
7
|
+
data.tar.gz: c224f537f42011a882d432fd6d14202958ab4f91af54c33256c4b57f4d37a20dfb559f4676d8b9aa04063631b110ef0eb7af366a57ef1f6f92589f2c4ab72fac
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## 1.0.3 (May 1, 2012)
|
|
2
|
+
|
|
3
|
+
- Don't enable NAT DNS proxy on machines where resolv.conf already points
|
|
4
|
+
to localhost. This allows Vagrant to work once again with Ubuntu
|
|
5
|
+
12.04. [GH-909]
|
|
6
|
+
|
|
1
7
|
## 1.0.2 (March 25, 2012)
|
|
2
8
|
|
|
3
9
|
- Provisioners will still mount folders and such if `--no-provision` is
|
|
@@ -28,13 +28,34 @@ module Vagrant
|
|
|
28
28
|
]
|
|
29
29
|
attempt_and_log(command, "Enabling the Host I/O cache on the SATA controller...")
|
|
30
30
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
31
|
+
enable_dns_proxy = true
|
|
32
|
+
begin
|
|
33
|
+
contents = File.read("/etc/resolv.conf")
|
|
34
|
+
|
|
35
|
+
if contents =~ /^nameserver 127\.0\.0\.1$/
|
|
36
|
+
# The use of both natdnsproxy and natdnshostresolver break on
|
|
37
|
+
# Ubuntu 12.04 that uses resolvconf with localhost. When used
|
|
38
|
+
# VirtualBox will give the client dns server 10.0.2.3, while
|
|
39
|
+
# not binding to that address itself. Therefore disable this
|
|
40
|
+
# feature if host uses the resolvconf server 127.0.0.1
|
|
41
|
+
@logger.info("Disabling DNS proxy since resolv.conf contains 127.0.0.1")
|
|
42
|
+
enable_dns_proxy = false
|
|
43
|
+
end
|
|
44
|
+
rescue Errno::ENOENT; end
|
|
45
|
+
|
|
46
|
+
# Enable/disable the NAT DNS proxy as necessary
|
|
47
|
+
if enable_dns_proxy
|
|
48
|
+
command = [
|
|
49
|
+
"modifyvm", env[:vm].uuid,
|
|
50
|
+
"--natdnsproxy1", "on"
|
|
51
|
+
]
|
|
52
|
+
attempt_and_log(command, "Enable the NAT DNS proxy on adapter 1...")
|
|
53
|
+
else
|
|
54
|
+
command = [ "modifyvm", env[:vm].uuid, "--natdnsproxy1", "off" ]
|
|
55
|
+
attempt_and_log(command, "Disable the NAT DNS proxy on adapter 1...")
|
|
56
|
+
command = [ "modifyvm", env[:vm].uuid, "--natdnshostresolver1", "off" ]
|
|
57
|
+
attempt_and_log(command, "Disable the NAT DNS resolver on adapter 1...")
|
|
58
|
+
end
|
|
38
59
|
|
|
39
60
|
@app.call(env)
|
|
40
61
|
end
|
data/lib/vagrant/version.rb
CHANGED