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

More robust hostname checking for RedHat [GH-1566]

This commit is contained in:
Mitchell Hashimoto 2013-04-10 09:33:33 -07:00
parent 5690aef4b0
commit ba07d303e5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -79,6 +79,7 @@ BUG FIXES:
is not created. [GH-1562] is not created. [GH-1562]
- Multiple machines defined in the same Vagrantfile with the same - Multiple machines defined in the same Vagrantfile with the same
name will properly merge. name will properly merge.
- More robust hostname checking for RedHat. [GH-1566]
## 1.1.6 (April 3, 2013) ## 1.1.6 (April 3, 2013)

2
plugins/guests/redhat/cap/change_host_name.rb
View File

@ -5,7 +5,7 @@ module VagrantPlugins
def self.change_host_name(machine, name) def self.change_host_name(machine, name)
machine.communicate.tap do |comm| machine.communicate.tap do |comm|
# Only do this if the hostname is not already set # Only do this if the hostname is not already set
if !comm.test("sudo hostname | grep '#{name}'") if !comm.test("sudo hostname | grep --line-regexp '#{name}'")
comm.sudo("sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network") comm.sudo("sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network")
comm.sudo("hostname #{name}") comm.sudo("hostname #{name}")
comm.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts") comm.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")