summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremiah Snapp <jeremiah@chef.io>2015-08-11 10:07:04 -0400
committerJeremiah Snapp <jeremiah@chef.io>2015-08-11 11:51:41 -0400
commite8bfae7823d5414eda30fbc63b2d6e4ded96d21f (patch)
tree95d6859b30754b6075c742cd93006a603aa7af4f
parent3a5e1819c4439836767a001182c1e19de1cfb7e9 (diff)
downloadchef-jhs/fix-reboot_pending.tar.gz
Make reboot_pending? look for CBS RebootPendingjhs/fix-reboot_pending
Ref: https://gallery.technet.microsoft.com/scriptcenter/Get-PendingReboot-Query-bdb79542
-rw-r--r--lib/chef/dsl/reboot_pending.rb2
-rw-r--r--spec/unit/dsl/reboot_pending_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/dsl/reboot_pending.rb b/lib/chef/dsl/reboot_pending.rb
index 7af67e94a5..c577118dd4 100644
--- a/lib/chef/dsl/reboot_pending.rb
+++ b/lib/chef/dsl/reboot_pending.rb
@@ -45,7 +45,7 @@ class Chef
registry_key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired') ||
# Vista + Server 2008 and newer may have reboots pending from CBS
- registry_key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired') ||
+ registry_key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending') ||
# The mere existence of the UpdateExeVolatile key should indicate a pending restart for certain updates
# http://support.microsoft.com/kb/832475
diff --git a/spec/unit/dsl/reboot_pending_spec.rb b/spec/unit/dsl/reboot_pending_spec.rb
index 0f2288740f..a55f91d5e6 100644
--- a/spec/unit/dsl/reboot_pending_spec.rb
+++ b/spec/unit/dsl/reboot_pending_spec.rb
@@ -46,7 +46,7 @@ describe Chef::DSL::RebootPending do
end
it 'should return true if key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired" exists' do
- allow(recipe).to receive(:registry_key_exists?).with('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired').and_return(true)
+ allow(recipe).to receive(:registry_key_exists?).with('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending').and_return(true)
expect(recipe.reboot_pending?).to be_truthy
end