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

Merge pull request #6502 from dmacvicar/fix-dhcp-on-suse 

SUSE-flavored systems use STARTMODE and not ONBOOT
This commit is contained in:
Mitchell Hashimoto 2015-11-18 11:05:36 -08:00
parent d1baffe064 a21d5be705
commit f1827602f2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/guests/suse/network_dhcp.erb
View File

@ -1,6 +1,6 @@
#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=dhcp BOOTPROTO='dhcp'
ONBOOT=yes STARTMODE='auto'
DEVICE=eth<%= options[:interface] %> DEVICE='eth<%= options[:interface] %>'
#VAGRANT-END #VAGRANT-END

6
test/unit/templates/guests/suse/network_dhcp_test.rb
View File

@ -12,9 +12,9 @@ describe "templates/guests/suse/network_dhcp" do
expect(result).to eq <<-EOH.gsub(/^ {6}/, "") expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
#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=dhcp BOOTPROTO='dhcp'
ONBOOT=yes STARTMODE='auto'
DEVICE=ethen0 DEVICE='ethen0'
#VAGRANT-END #VAGRANT-END
EOH EOH
end end