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

Merge pull request #8336 from chrisroberts/networking/overhaul 

Remove hardcoded interface name from template
This commit is contained in:
Chris Roberts 2017-03-23 09:10:01 -07:00 committed by GitHub
parent b90ba95804 d862133038
commit 21b7214668
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -31,9 +31,9 @@ describe "templates/guests/debian/network_dhcp" do
auto eth1 auto eth1
iface eth1 inet dhcp iface eth1 inet dhcp
# We need to disable eth0, see GH-2648 # We need to disable eth0, see GH-2648
post-up route del default dev eth0 || true post-up route del default dev $IFACE || true
post-up dhclient $IFACE post-up dhclient $IFACE
pre-down route add default dev eth0 pre-down route add default dev $IFACE
#VAGRANT-END #VAGRANT-END
EOH EOH
end end