X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9302cec0aab75609f536109ac0c10f3a44a204ef..f8615415d66741ec7ad5aa2b9d23272f10e2b1a2:/cookbooks/hardware/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 4122a7ac8..6ea634ee9 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -331,6 +331,8 @@ if node[:virtualization][:role] != "guest" ||
   end
 end
 
+include_recipe "apt::hwraid" unless status_packages.empty?
+
 %w[ssacli lsiutil sas2ircu megactl megacli arcconf].each do |tools_package|
   if tools_packages.include?(tools_package)
     package tools_package
@@ -359,8 +361,6 @@ else
   end
 end
 
-include_recipe "apt::hwraid" unless status_packages.empty?
-
 %w[cciss-vol-status mpt-status sas2ircu-status megaclisas-status aacraid-status].each do |status_package|
   if status_packages.include?(status_package)
     package status_package
@@ -465,6 +465,10 @@ end
 disks = disks.compact.uniq
 
 if disks.count.positive?
+  apt_preference "smartmontools" do
+    action :remove
+  end
+
   package "smartmontools"
 
   template "/etc/cron.daily/update-smart-drivedb" do