X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/cb646590a622f93f6eb78f5b6d8a0cfbb0e23ab2..49d17eb0a36317f7a18650c557bb69f356c0a598:/cookbooks/sysctl/recipes/default.rb

diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index 0190b37b7..bf9860e0c 100644
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -27,8 +27,16 @@ if node[:virtualization][:role] != "guest" ||
     group[:parameters].each do |key, value|
       sysctl key do
         value value
-        comment group[:comment]
+        # comment group[:comment]
       end
     end
   end
+
+  Dir.new("/etc/sysctl.d").each_entry do |file|
+    next unless file =~ /^99-chef-(.*)\.conf$/
+
+    sysctl Regexp.last_match(1) do
+      action :remove
+    end
+  end
 end