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

Merge pull request #1096 from danmidwood/master 

Use the communicate interface for Arch Linux guests
This commit is contained in:
Mitchell Hashimoto 2012-09-09 20:08:16 -07:00
parent 46feb55396 bdf72c5554
commit 8c233f7d22
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/guests/arch/guest.rb
View File

@ -14,10 +14,10 @@ module VagrantPlugins
def change_host_name(name)
# Only do this if the hostname is not already set
if !vm.channel.test("sudo hostname | grep '#{name}'")
vm.channel.sudo("sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/rc.conf")
vm.channel.sudo("hostname #{name}")
vm.channel.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} @' /etc/hosts")
if !vm.communicate.test("sudo hostname | grep '#{name}'")
vm.communicate.sudo("sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/rc.conf")
vm.communicate.sudo("hostname #{name}")
vm.communicate.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} @' /etc/hosts")
end
end
@ -31,9 +31,9 @@ module VagrantPlugins
temp.write(entry)
temp.close
vm.channel.upload(temp.path, "/tmp/vagrant_network")
vm.channel.sudo("mv /tmp/vagrant_network /etc/network.d/interfaces/eth#{network[:interface]}")
vm.channel.sudo("netcfg interfaces/eth#{network[:interface]}")
vm.communicate.upload(temp.path, "/tmp/vagrant_network")
vm.communicate.sudo("mv /tmp/vagrant_network /etc/network.d/interfaces/eth#{network[:interface]}")
vm.communicate.sudo("netcfg interfaces/eth#{network[:interface]}")
end
end
end