haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add use_dhcp_assigned_default_route setting to allow for dhcp bridged interfaces which have a default route assigned by dhcp

This commit is contained in:
Justin Lynn 2012-04-05 09:21:09 -07:00
parent 00c4193b43
commit bf3d3b0245
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/vagrant/action/vm/network.rb
View File

@ -315,7 +315,8 @@ module Vagrant
:adapter => nil, :adapter => nil,
:mac => nil, :mac => nil,
:bridge => nil, :bridge => nil,
:auto_config => true :auto_config => true,
:use_dhcp_assigned_default_route => false
}.merge(options) }.merge(options)
end end

2
templates/guests/debian/network_dhcp.erb
View File

@ -2,5 +2,7 @@
# The contents below are automatically generated by Vagrant. Do not modify. # The contents below are automatically generated by Vagrant. Do not modify.
auto eth<%= options[:interface] %> auto eth<%= options[:interface] %>
iface eth<%= options[:interface] %> inet dhcp iface eth<%= options[:interface] %> inet dhcp
<% unless options[:use_dhcp_assigned_default_route] %>
post-up route del default dev $IFACE post-up route del default dev $IFACE
<% end %>
#VAGRANT-END #VAGRANT-END