lib/vagrant-vmware-dhcp/plugin.rb in vagrant-vmware-dhcp-0.0.6 vs lib/vagrant-vmware-dhcp/plugin.rb in vagrant-vmware-dhcp-0.0.7
- old
+ new
@@ -17,15 +17,17 @@
action = Vagrant::Action::Builtin::ConfigValidate
hook.before(action, VagrantVmwareDhcp::Action::SetMac)
end
action_hook('DA VMWare Network: Configure dhcp.conf') do |hook|
- if Vagrant::Util::Platform.windows?
+ if defined?(ActionClass) and defined?(ConfigDhcpClass)
+ # no-op
+ elsif Vagrant::Util::Platform.windows?
ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpWindows
- ActionClass = HashiCorp::VagrantVMwaredesktop::Action::Network
+ ActionClass = HashiCorp::VagrantVMwareworkstation::Action::Network
elsif Vagrant::Util::Platform.linux?
ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpLinux
- ActionClass = HashiCorp::VagrantVMwaredesktop::Action::Network
+ ActionClass = HashiCorp::VagrantVMwareworkstation::Action::Network
elsif Vagrant::Util::Platform.darwin?
ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpDarwin
ActionClass = HashiCorp::VagrantVMwarefusion::Action::Network
end