upstream/vagrant
1
0
Fork 0
mirror of https://github.com/hashicorp/vagrant.git synced 2026-05-28 04:36:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
SUSE-flavored systems use STARTMODE and not ONBOOT
This commit is contained in:
Mitchell Hashimoto 2015-11-18 11:05:36 -08:00
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
# The contents below are automatically generated by Vagrant. Do not modify.
BOOTPROTO=dhcp
ONBOOT=yes
DEVICE=eth<%= options[:interface] %>
BOOTPROTO='dhcp'
STARTMODE='auto'
DEVICE='eth<%= options[:interface] %>'
#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}/, "")
#VAGRANT-BEGIN
# The contents below are automatically generated by Vagrant. Do not modify.
BOOTPROTO=dhcp
ONBOOT=yes
DEVICE=ethen0
BOOTPROTO='dhcp'
STARTMODE='auto'
DEVICE='ethen0'
#VAGRANT-END
EOH
end