diff options
| author | Tim Smith <tsmith@chef.io> | 2020-12-09 16:16:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 16:16:52 -0800 |
| commit | 306de1c5647d2e41f4db12f8f300b46c6b3d136e (patch) | |
| tree | 80ae99c796d57602e3eecad22b83b23ba0dab6cb | |
| parent | b72d8042e3ac468d31346ffe637b72b778524827 (diff) | |
| parent | 7902b7bc55961b5422e46bf045335e28b9293ef9 (diff) | |
| download | chef-306de1c5647d2e41f4db12f8f300b46c6b3d136e.tar.gz | |
Merge pull request #10724 from chef/lcg/mac-hostname
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/resource/hostname.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/resource/hostname.rb b/lib/chef/resource/hostname.rb index 27903e5807..6a2656e049 100644 --- a/lib/chef/resource/hostname.rb +++ b/lib/chef/resource/hostname.rb @@ -131,18 +131,18 @@ class Chef # darwin declare_resource(:execute, "set HostName via scutil") do command "/usr/sbin/scutil --set HostName #{new_resource.hostname}" - not_if { shell_out!("/usr/sbin/scutil --get HostName").stdout.chomp == new_resource.hostname } + not_if { shell_out("/usr/sbin/scutil --get HostName").stdout.chomp == new_resource.hostname } notifies :reload, "ohai[reload hostname]" end declare_resource(:execute, "set ComputerName via scutil") do command "/usr/sbin/scutil --set ComputerName #{new_resource.hostname}" - not_if { shell_out!("/usr/sbin/scutil --get ComputerName").stdout.chomp == new_resource.hostname } + not_if { shell_out("/usr/sbin/scutil --get ComputerName").stdout.chomp == new_resource.hostname } notifies :reload, "ohai[reload hostname]" end shortname = new_resource.hostname[/[^\.]*/] declare_resource(:execute, "set LocalHostName via scutil") do command "/usr/sbin/scutil --set LocalHostName #{shortname}" - not_if { shell_out!("/usr/sbin/scutil --get LocalHostName").stdout.chomp == shortname } + not_if { shell_out("/usr/sbin/scutil --get LocalHostName").stdout.chomp == shortname } notifies :reload, "ohai[reload hostname]" end when linux? |