diff options
| author | Chris Doherty <cdoherty@getchef.com> | 2014-09-04 12:24:57 -0700 |
|---|---|---|
| committer | Chris Doherty <cdoherty@getchef.com> | 2014-09-10 16:34:22 -0700 |
| commit | bf64c21888102e57cb910ec298db025af2829dc8 (patch) | |
| tree | 391523cbb8472b02ee653fc5efcb55d31dc67a6f | |
| parent | c62aae31840d3a9b2bc179273ace9e54690a311d (diff) | |
| download | chef-bf64c21888102e57cb910ec298db025af2829dc8.tar.gz | |
For deciding whether or not to actually reboot, use *only* our internal implementation, ignoring any system indicators. In other words, only reboot when someone has requested it from the reboot resource.
| -rw-r--r-- | lib/chef/rebooter.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/chef/rebooter.rb b/lib/chef/rebooter.rb index d33229c921..1c187ec3bc 100644 --- a/lib/chef/rebooter.rb +++ b/lib/chef/rebooter.rb @@ -26,7 +26,6 @@ require 'chef/platform' class Chef class Rebooter # below are awkward contortions to re-use the RebootPending code. - include Chef::DSL::RebootPending include Chef::Mixin::ShellOut attr_reader :reboot_info @@ -55,7 +54,7 @@ class Chef def self.reboot_if_needed!(node) @@rebooter ||= self.new(node) - if @@rebooter.reboot_pending? + if node.run_context.reboot_requested? @@rebooter.reboot! end end |