Merge pull request #7889 from chef/initramfs_14

Backport: Defer running initramfs_command until end of run

1 files changed, 19 insertions, 13 deletions

diff --git a/lib/chef/resource/kernel_module.rb b/lib/chef/resource/kernel_module.rb
index 54f213cd11..ea33d19ff1 100644
--- a/lib/chef/resource/kernel_module.rb
+++ b/lib/chef/resource/kernel_module.rb
@@ -41,12 +41,14 @@ class Chef
 
         file "#{new_resource.load_dir}/#{new_resource.modname}.conf" do
           content "#{new_resource.modname}\n"
-          notifies :run, "execute[update initramfs]"
+          notifies :run, "execute[update initramfs]", :delayed
         end
 
-        execute "update initramfs" do
-          command initramfs_command
-          action :nothing
+        with_run_context :root do
+          find_resource(:execute, "update initramfs") do
+            command initramfs_command
+            action :nothing
+          end
         end
       end
 
@@ -55,17 +57,19 @@ class Chef
 
         file "#{new_resource.load_dir}/#{new_resource.modname}.conf" do
           action :delete
-          notifies :run, "execute[update initramfs]"
+          notifies :run, "execute[update initramfs]", :delayed
         end
 
         file "#{new_resource.unload_dir}/blacklist_#{new_resource.modname}.conf" do
           action :delete
-          notifies :run, "execute[update initramfs]"
+          notifies :run, "execute[update initramfs]", :delayed
         end
 
-        execute "update initramfs" do
-          command initramfs_command
-          action :nothing
+        with_run_context :root do
+          find_resource(:execute, "update initramfs") do
+            command initramfs_command
+            action :nothing
+          end
         end
 
         new_resource.run_action(:unload)
@@ -76,12 +80,14 @@ class Chef
 
         file "#{new_resource.unload_dir}/blacklist_#{new_resource.modname}.conf" do
           content "blacklist #{new_resource.modname}"
-          notifies :run, "execute[update initramfs]"
+          notifies :run, "execute[update initramfs]", :delayed
         end
 
-        execute "update initramfs" do
-          command initramfs_command
-          action :nothing
+        with_run_context :root do
+          find_resource(:execute, "update initramfs") do
+            command initramfs_command
+            action :nothing
+          end
         end
 
         new_resource.run_action(:unload)