Merge pull request #1554 from schisamo/redhat-network-fixes

Red Hat / Fedora networking template fixes
This commit is contained in:
Mitchell Hashimoto 2013-04-07 13:11:15 -07:00
commit 421e16fefa
2 changed files with 3 additions and 2 deletions

View File

@ -1,7 +1,7 @@
#VAGRANT-BEGIN #VAGRANT-BEGIN
# The contents below are automatically generated by Vagrant. Do not modify. # The contents below are automatically generated by Vagrant. Do not modify.
NM_CONTROLLED=no NM_CONTROLLED=no
BOOTPROTO=static BOOTPROTO=none
ONBOOT=yes ONBOOT=yes
IPADDR=<%= options[:ip] %> IPADDR=<%= options[:ip] %>
NETMASK=<%= options[:netmask] %> NETMASK=<%= options[:netmask] %>

View File

@ -1,7 +1,8 @@
#VAGRANT-BEGIN #VAGRANT-BEGIN
# The contents below are automatically generated by Vagrant. Do not modify. # The contents below are automatically generated by Vagrant. Do not modify.
BOOTPROTO=static BOOTPROTO=none
IPADDR=<%= options[:ip] %> IPADDR=<%= options[:ip] %>
NETMASK=<%= options[:netmask] %> NETMASK=<%= options[:netmask] %>
DEVICE=eth<%= options[:interface] %> DEVICE=eth<%= options[:interface] %>
PEERDNS=no
#VAGRANT-END #VAGRANT-END