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

Fix #8730. Use 'ip route' in lieu of 'route' in debian dhcp template

This commit is contained in:
Joe Hosteny 2017-06-28 13:18:51 -04:00
parent f2fb2bafa8
commit 0b305cd4ee
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,11 +3,11 @@
auto <%= options[:device] %>
iface <%= options[:device] %> inet dhcp
<% if !options[:use_dhcp_assigned_default_route] %>
post-up route del default dev $IFACE || true
post-up ip route del default dev $IFACE || true
<% else %>
# We need to disable eth0, see GH-2648
post-up route del default dev <%= options[:root_device] %> || true
post-up ip route del default dev <%= options[:root_device] %> || true
post-up dhclient $IFACE
pre-down route add default dev <%= options[:root_device] %>
pre-down ip route add default dev <%= options[:root_device] %>
<% end %>
#VAGRANT-END

6
test/unit/templates/guests/debian/network_dhcp_test.rb
View File

@ -14,7 +14,7 @@ describe "templates/guests/debian/network_dhcp" do
# The contents below are automatically generated by Vagrant. Do not modify.
auto eth1
iface eth1 inet dhcp
post-up route del default dev $IFACE || true
post-up ip route del default dev $IFACE || true
#VAGRANT-END
EOH
end
@ -32,9 +32,9 @@ describe "templates/guests/debian/network_dhcp" do
auto eth1
iface eth1 inet dhcp
# We need to disable eth0, see GH-2648
post-up route del default dev eth0 || true
post-up ip route del default dev eth0 || true
post-up dhclient $IFACE
pre-down route add default dev eth0
pre-down ip route add default dev eth0
#VAGRANT-END
EOH
end