Merge pull request #1760 from tunix/netctl

fixed networking issues of Arch Linux with netctl changes
This commit is contained in:
Mitchell Hashimoto 2013-06-09 15:52:02 -07:00
commit 958efc28a7
3 changed files with 12 additions and 12 deletions

View File

@ -13,8 +13,9 @@ module VagrantPlugins
temp.close temp.close
machine.communicate.upload(temp.path, "/tmp/vagrant_network") machine.communicate.upload(temp.path, "/tmp/vagrant_network")
machine.communicate.sudo("mv /tmp/vagrant_network /etc/network.d/interfaces/eth#{network[:interface]}") machine.communicate.sudo("ln -sf /dev/null /etc/udev/rules.d/80-net-name-slot.rules")
machine.communicate.sudo("netcfg interfaces/eth#{network[:interface]}") machine.communicate.sudo("mv /tmp/vagrant_network /etc/netctl/eth#{network[:interface]}")
machine.communicate.sudo("netctl start eth#{network[:interface]}")
end end
end end
end end

View File

@ -1,4 +1,4 @@
CONNECTION='ethernet' Description='A basic dhcp ethernet connection'
DESCRIPTION='A basic dhcp ethernet connection' Interface=eth<%= options[:interface] %>
INTERFACE='eth<%= options[:interface] %>' Connection=ethernet
IP='dhcp' IP=dhcp

View File

@ -1,6 +1,5 @@
CONNECTION='ethernet' Connection=ethernet
DESCRIPTION='A basic static ethernet connection' Description='A basic static ethernet connection'
INTERFACE='eth<%= options[:interface] %>' Interface=eth<%= options[:interface] %>
IP='static' IP=static
ADDR='<%= options[:ip]%>' Address=('<%= options[:ip]%>/24')
NETMASK='<%= options[:netmask] %>'