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

guests: Always search for FQDN without sudo

This commit is contained in:
Seth Vargo 2016-06-22 19:29:46 -07:00
parent 8f3b6511f2
commit cf91bcf029
No known key found for this signature in database
GPG Key ID: 905A90C2949E8787
15 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/guests/arch/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 -f | grep '^#{name}$'") if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, "") comm.sudo <<-EOH.gsub(/^ {14}/, "")
hostnamectl set-hostname '#{basename}' hostnamectl set-hostname '#{basename}'

2
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 -f | grep '^#{name}$'") if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, "") comm.sudo <<-EOH.gsub(/^ {14}/, "")
hostnamectl set-hostname '#{basename}' hostnamectl set-hostname '#{basename}'

2
plugins/guests/coreos/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 --fqdn | grep -w '#{name}'") if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo("hostname '#{basename}'") comm.sudo("hostname '#{basename}'")

2
plugins/guests/darwin/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 -f | grep -w '#{name}' || hostname -s | grep -w '#{name}'") if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, '') comm.sudo <<-EOH.gsub(/^ {14}/, '')

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

@ -9,7 +9,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 -f | grep '^#{name}$'") if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, '') comm.sudo <<-EOH.gsub(/^ {14}/, '')
# Set the hostname # Set the hostname

2
plugins/guests/fedora/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}'") if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, "") comm.sudo <<-EOH.gsub(/^ {14}/, "")
echo '#{basename}' > /etc/hostname echo '#{basename}' > /etc/hostname

5
plugins/guests/freebsd/cap/change_host_name.rb
View File

@ -3,10 +3,9 @@ module VagrantPlugins
module Cap module Cap
class ChangeHostName class ChangeHostName
def self.change_host_name(machine, name) def self.change_host_name(machine, name)
options = { shell: "sh" }
comm = machine.communicate comm = machine.communicate
if !comm.test("hostname -f | grep '^#{name}$'", options) if !comm.test("hostname -f | grep '^#{name}$'", sudo: false, shell: "sh")
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
command = <<-EOH.gsub(/^ {14}/, '') command = <<-EOH.gsub(/^ {14}/, '')
# Set the hostname # Set the hostname
@ -23,7 +22,7 @@ module VagrantPlugins
mv /tmp/tmp-hosts /etc/hosts mv /tmp/tmp-hosts /etc/hosts
} }
EOH EOH
comm.sudo(command, options) comm.sudo(command, shell: "sh")
end end
end end
end end

2
plugins/guests/gentoo/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 -f | grep '^#{name}$'") if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, "") comm.sudo <<-EOH.gsub(/^ {14}/, "")
# Set the hostname # Set the hostname

2
plugins/guests/omnios/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: false) if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, '') comm.sudo <<-EOH.gsub(/^ {14}/, '')
# Set hostname # Set hostname

2
plugins/guests/photon/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 -f | grep -w '#{name}'", sudo: false) if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, '') comm.sudo <<-EOH.gsub(/^ {14}/, '')
# Set the hostname # Set the hostname

2
plugins/guests/pld/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: false) if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, '') comm.sudo <<-EOH.gsub(/^ {14}/, '')
hostname '#{name}' hostname '#{name}'

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)
comm = machine.communicate comm = machine.communicate
if !comm.test("hostname -f | grep -w '#{name}'", sudo: false) if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split('.', 2)[0] basename = name.split('.', 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, '') comm.sudo <<-EOH.gsub(/^ {14}/, '')
# Update sysconfig # Update sysconfig

2
plugins/guests/slackware/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 -f | grep -w '#{name}'", sudo: false) if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, '') comm.sudo <<-EOH.gsub(/^ {14}/, '')
# Set the hostname # Set the hostname

2
plugins/guests/suse/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 -f | grep -w '#{name}'", sudo: false) if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, '') comm.sudo <<-EOH.gsub(/^ {14}/, '')
echo '#{name}' > /etc/HOSTNAME echo '#{name}' > /etc/HOSTNAME

2
plugins/guests/ubuntu/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 -f | grep -w '#{name}'") if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
basename = name.split(".", 2)[0] basename = name.split(".", 2)[0]
comm.sudo <<-EOH.gsub(/^ {14}/, '') comm.sudo <<-EOH.gsub(/^ {14}/, '')
# Set the hostname # Set the hostname