summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2020-12-09 16:07:12 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2020-12-09 16:07:12 -0800
commit7902b7bc55961b5422e46bf045335e28b9293ef9 (patch)
tree80ae99c796d57602e3eecad22b83b23ba0dab6cb
parentb72d8042e3ac468d31346ffe637b72b778524827 (diff)
downloadchef-7902b7bc55961b5422e46bf045335e28b9293ef9.tar.gz
Avoid erroring out when hostname is not set on mac
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--lib/chef/resource/hostname.rb6
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?