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

Merge pull request #4308 from Voxer/fix/master/issue4307 

guest/freebsd: fix interface device names in /etc/rc.conf
This commit is contained in:
Mitchell Hashimoto 2014-08-29 09:54:31 -07:00
parent c5ed3b97d1 102cb403e2
commit 9e5a2d28c6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/guests/freebsd/cap/configure_networks.rb
View File

@ -27,7 +27,7 @@ module VagrantPlugins
end end
entry = TemplateRenderer.render("guests/freebsd/network_#{network[:type]}", entry = TemplateRenderer.render("guests/freebsd/network_#{network[:type]}",
options: network) options: network, ifname: ifname)
# Write the entry to a temporary location # Write the entry to a temporary location
temp = Tempfile.new("vagrant") temp = Tempfile.new("vagrant")

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

@ -1,3 +1,3 @@
#VAGRANT-BEGIN #VAGRANT-BEGIN
ifconfig_em<%= options[:interface] %>="DHCP" ifconfig_<%= ifname %>="DHCP"
#VAGRANT-END #VAGRANT-END

2
templates/guests/freebsd/network_static.erb
View File

@ -1,3 +1,3 @@
#VAGRANT-BEGIN #VAGRANT-BEGIN
ifconfig_em<%= options[:interface] %>="inet <%= options[:ip] %> netmask <%= options[:netmask] %>" ifconfig_<%= ifname %>="inet <%= options[:ip] %> netmask <%= options[:netmask] %>"
#VAGRANT-END #VAGRANT-END