diff options
author | Tom Doherty <tom.doherty@fixnetix.com> | 2018-11-05 11:26:52 +0000 |
---|---|---|
committer | Tom Doherty <tom.doherty@fixnetix.com> | 2018-11-05 11:26:52 +0000 |
commit | 7ebca90c4fd10e3c38b040ae2b84f4e1a5c9b400 (patch) | |
tree | a822438d87f4f37f1241af9c5f7653850c9245a1 | |
parent | 0ab5435907d7f6c380b9e3ea49014a3b8a9863dc (diff) | |
download | chef-7ebca90c4fd10e3c38b040ae2b84f4e1a5c9b400.tar.gz |
Defer running initramfs_command until end of run
Signed-off-by: Tom Doherty <tom.doherty@fixnetix.com>
-rw-r--r-- | lib/chef/resource/kernel_module.rb | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/lib/chef/resource/kernel_module.rb b/lib/chef/resource/kernel_module.rb index 0976b9c211..041ada9fed 100644 --- a/lib/chef/resource/kernel_module.rb +++ b/lib/chef/resource/kernel_module.rb @@ -40,12 +40,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 @@ -54,17 +56,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) @@ -75,12 +79,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) |