Skip to content

Commit

Permalink
Release v1.3.7
Browse files Browse the repository at this point in the history
* master:
  Version bumped to 1.3.7
  config: Added 'post-import' customization step [GH-165]
  driver: Ensure that "prlsrvctl" returns info about DHCPv4 server
  • Loading branch information
legal90 committed Dec 25, 2014
2 parents d08c504 + 34a506c commit bd23ba4
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions lib/vagrant-parallels/action.rb
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ def self.action_up
if env1[:result]
b1.use Customize, "pre-import"
b1.use Import
b1.use Customize, 'post-import'
end
end
b.use action_start
Expand Down
2 changes: 1 addition & 1 deletion lib/vagrant-parallels/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def finalize!

def validate(machine)
errors = _detected_errors
valid_events = ["pre-import", "pre-boot", "post-boot", "post-comm"]
valid_events = ['pre-import', 'post-import', 'pre-boot', 'post-boot', 'post-comm']
@customizations.each do |event, _|
if !valid_events.include?(event)
errors << I18n.t("vagrant_parallels.config.invalid_event",
Expand Down
12 changes: 6 additions & 6 deletions lib/vagrant-parallels/driver/pd_10.rb
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,13 @@ def read_host_only_interfaces

# There may be a fake DHCPv4 parameters
# We can trust them only if adapter IP and DHCP IP are in the same subnet
dhcp_ip = net_info['DHCPv4 server']['Server address']
if network_address(info[:ip], info[:netmask]) ==
network_address(dhcp_ip, info[:netmask])
dhcp_info = net_info['DHCPv4 server']
if dhcp_info && (network_address(info[:ip], info[:netmask]) ==
network_address(dhcp_info['Server address'], info[:netmask]))
info[:dhcp] = {
ip: dhcp_ip,
lower: net_info['DHCPv4 server']['IP scope start address'],
upper: net_info['DHCPv4 server']['IP scope end address']
ip: dhcp_info['Server address'],
lower: dhcp_info['IP scope start address'],
upper: dhcp_info['IP scope end address']
}
end
hostonly_ifaces << info
Expand Down
12 changes: 6 additions & 6 deletions lib/vagrant-parallels/driver/pd_8.rb
Original file line number Diff line number Diff line change
Expand Up @@ -287,13 +287,13 @@ def read_host_only_interfaces

# There may be a fake DHCPv4 parameters
# We can trust them only if adapter IP and DHCP IP are in the same subnet
dhcp_ip = net_info['DHCPv4 server']['Server address']
if network_address(info[:ip], info[:netmask]) ==
network_address(dhcp_ip, info[:netmask])
dhcp_info = net_info['DHCPv4 server']
if dhcp_info && (network_address(info[:ip], info[:netmask]) ==
network_address(dhcp_info['Server address'], info[:netmask]))
info[:dhcp] = {
ip: dhcp_ip,
lower: net_info['DHCPv4 server']['IP scope start address'],
upper: net_info['DHCPv4 server']['IP scope end address']
ip: dhcp_info['Server address'],
lower: dhcp_info['IP scope start address'],
upper: dhcp_info['IP scope end address']
}
end
hostonly_ifaces << info
Expand Down
2 changes: 1 addition & 1 deletion lib/vagrant-parallels/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module VagrantPlugins
module Parallels
VERSION = '1.3.6'
VERSION = '1.3.7'
end
end

0 comments on commit bd23ba4

Please sign in to comment.