plugins/guests/freebsd/cap/change_host_name.rb in vagrant-unbundled-1.8.4.2 vs plugins/guests/freebsd/cap/change_host_name.rb in vagrant-unbundled-1.8.5.1

- old
+ new

@@ -1,14 +1,13 @@ module VagrantPlugins module GuestFreeBSD module Cap class ChangeHostName def self.change_host_name(machine, name) - options = { shell: "sh" } comm = machine.communicate - if !comm.test("hostname -f | grep -w '#{name}' || hostname -s | grep -w '#{name}'", options) + if !comm.test("hostname -f | grep '^#{name}$'", sudo: false, shell: "sh") basename = name.split(".", 2)[0] command = <<-EOH.gsub(/^ {14}/, '') # Set the hostname hostname '#{name}' sed -i '' 's/^hostname=.*$/hostname=\"#{name}\"/' /etc/rc.conf @@ -21,10 +20,10 @@ grep -w '#{name}' /etc/hosts || { echo -e '127.0.0.1\\t#{name}\\t#{basename}' | cat - /etc/hosts > /tmp/tmp-hosts mv /tmp/tmp-hosts /etc/hosts } EOH - comm.sudo(command, options) + comm.sudo(command, shell: "sh") end end end end end