nominatim: move apache setup to the end of the script

[chef.git] / cookbooks / hardware / attributes / default.rb

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 54c8956a3b502c600714ffa9eb6ef5d1f3886079..b558f9d8e3cc7792e7e077f05ece3a5770d694c6 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,4 +1,5 @@
 default[:hardware][:modules] = %w(loop lp rtc)
+default[:hardware][:grub][:cmdline] = %w(nomodeset)
 default[:hardware][:sensors] = {}
 
 if node[:dmi] && node[:dmi][:system]
@@ -8,7 +9,7 @@ if node[:dmi] && node[:dmi][:system]
 
     case dmi.system.product_name
     when "ProLiant DL360 G6", "ProLiant DL360 G7"
-      default[:hardware][:sensors][:"power_meter-*"][:power][:"power1"] = { :ignore => true }
+      default[:hardware][:sensors][:"power_meter-*"][:power][:power1] = { :ignore => true }
     end
   end
 end