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
commit 9e5a2d28c6
3 changed files with 3 additions and 3 deletions

View File

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

View File

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

View File

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