vagrant-parallels 1.3.6 → 1.3.7
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
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dfd2fa5af56237ca2457bd7c63abf411c45e8b6f
|
|
4
|
+
data.tar.gz: b24c41c2ee88f3693b984e5e6a904abf290111f8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0717e0ffb04952ef5f2a0ee20e27472d08936bb59e3b5b1e5a406071558ce50817537fe25aa6bc99f94cab83d36a19bff2553b0f5ca3f82d85a8096c9a960fd9
|
|
7
|
+
data.tar.gz: 668f8dfdcd42b7e694b672676bee2ef292d08595be7c8f45eeeb8724f81b1742f9361772e29630f5ed8f781ce24400abed47ace47efe2267463b7e984593f198
|
|
@@ -90,7 +90,7 @@ module VagrantPlugins
|
|
|
90
90
|
|
|
91
91
|
def validate(machine)
|
|
92
92
|
errors = _detected_errors
|
|
93
|
-
valid_events = [
|
|
93
|
+
valid_events = ['pre-import', 'post-import', 'pre-boot', 'post-boot', 'post-comm']
|
|
94
94
|
@customizations.each do |event, _|
|
|
95
95
|
if !valid_events.include?(event)
|
|
96
96
|
errors << I18n.t("vagrant_parallels.config.invalid_event",
|
|
@@ -146,13 +146,13 @@ module VagrantPlugins
|
|
|
146
146
|
|
|
147
147
|
# There may be a fake DHCPv4 parameters
|
|
148
148
|
# We can trust them only if adapter IP and DHCP IP are in the same subnet
|
|
149
|
-
|
|
150
|
-
if network_address(info[:ip], info[:netmask]) ==
|
|
151
|
-
network_address(
|
|
149
|
+
dhcp_info = net_info['DHCPv4 server']
|
|
150
|
+
if dhcp_info && (network_address(info[:ip], info[:netmask]) ==
|
|
151
|
+
network_address(dhcp_info['Server address'], info[:netmask]))
|
|
152
152
|
info[:dhcp] = {
|
|
153
|
-
ip:
|
|
154
|
-
lower:
|
|
155
|
-
upper:
|
|
153
|
+
ip: dhcp_info['Server address'],
|
|
154
|
+
lower: dhcp_info['IP scope start address'],
|
|
155
|
+
upper: dhcp_info['IP scope end address']
|
|
156
156
|
}
|
|
157
157
|
end
|
|
158
158
|
hostonly_ifaces << info
|
|
@@ -287,13 +287,13 @@ module VagrantPlugins
|
|
|
287
287
|
|
|
288
288
|
# There may be a fake DHCPv4 parameters
|
|
289
289
|
# We can trust them only if adapter IP and DHCP IP are in the same subnet
|
|
290
|
-
|
|
291
|
-
if network_address(info[:ip], info[:netmask]) ==
|
|
292
|
-
network_address(
|
|
290
|
+
dhcp_info = net_info['DHCPv4 server']
|
|
291
|
+
if dhcp_info && (network_address(info[:ip], info[:netmask]) ==
|
|
292
|
+
network_address(dhcp_info['Server address'], info[:netmask]))
|
|
293
293
|
info[:dhcp] = {
|
|
294
|
-
ip:
|
|
295
|
-
lower:
|
|
296
|
-
upper:
|
|
294
|
+
ip: dhcp_info['Server address'],
|
|
295
|
+
lower: dhcp_info['IP scope start address'],
|
|
296
|
+
upper: dhcp_info['IP scope end address']
|
|
297
297
|
}
|
|
298
298
|
end
|
|
299
299
|
hostonly_ifaces << info
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vagrant-parallels
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.3.
|
|
4
|
+
version: 1.3.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Mikhail Zholobov
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2014-12-
|
|
12
|
+
date: 2014-12-25 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: bundler
|