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

guests/atomic: Do not use sudo when checking hostname 

The `hostname` command does not require root to execute
This commit is contained in:
Seth Vargo 2016-05-30 22:54:27 -04:00
parent 50690dab12
commit 31e02cddf5
No known key found for this signature in database
GPG Key ID: 905A90C2949E8787
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/guests/atomic/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)
comm = machine.communicate comm = machine.communicate
if !comm.test("hostname | grep -w '#{name}'", sudo: true) if !comm.test("hostname | grep -w '#{name}'")
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH comm.sudo <<-EOH
hostnamectl set-hostname '#{name}' hostnamectl set-hostname '#{name}'
@ -14,7 +14,9 @@ hostnamectl set-hostname '#{name}'
sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts
# Prepend ourselves to /etc/hosts # Prepend ourselves to /etc/hosts
sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts grep -w '#{name}' /etc/hosts || {
sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
}
EOH EOH
end end
end end