summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/chef/client.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index aa03f043c2..5ea2d236b2 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -293,7 +293,7 @@ class Chef
end
def node_name
- name = Chef::Config[:node_name] || ohai[:fqdn] || ohai[:hostname]
+ name = Chef::Config[:node_name] || ohai[:fqdn] || ohai[:machinename] || ohai[:hostname]
Chef::Config[:node_name] = name
unless name