do_windows_admin_check() function depends on ohai information if config file doesn't have :node_name.

So we should run it after OHAI.

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 837f8ad432..30b714cded 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -471,10 +471,6 @@ class Chef
     # === Returns
     # true:: Always returns true.
     def do_run
-      # Check for windows administrator rights incase they create an
-      # issue while trying to create / acquire run_lock.
-      do_windows_admin_check
-
       runlock = RunLock.new(Chef::Config.lockfile)
       runlock.acquire
       # don't add code that may fail before entering this section to be sure to release lock
@@ -497,6 +493,8 @@ class Chef
         Chef::Log.info("Starting Chef Run for #{node.name}")
         run_started
 
+        do_windows_admin_check
+
         run_context = setup_run_context
 
         converge(run_context)