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

Merge pull request #4262 from danielparks/master 

guests/debian: Fix #3860 by making sure post-up command never returns an error code
This commit is contained in:
Mitchell Hashimoto 2014-08-05 17:23:31 -07:00
parent cac231d0f8 e7dce43af3
commit ae8ace03fa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
auto eth<%= options[:interface] %> auto eth<%= options[:interface] %>
iface eth<%= options[:interface] %> inet dhcp iface eth<%= options[:interface] %> inet dhcp
<% if !options[:use_dhcp_assigned_default_route] %> <% if !options[:use_dhcp_assigned_default_route] %>
post-up route del default dev $IFACE 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 post-up route del default dev eth0