From: Tom Hughes <tom@compton.nu>
Date: Wed, 18 May 2016 07:58:57 +0000 (+0100)
Subject: Fix identification of HP RID controllers with newer kernels
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/fb9cd4b55ad7b3b7c28993305b23c7893885e90d?hp=b65d8cebd4b510a38156965b6a4fce03cdcf36d9

Fix identification of HP RID controllers with newer kernels
---

diff --git a/cookbooks/hardware/templates/default/ohai.rb.erb b/cookbooks/hardware/templates/default/ohai.rb.erb
index 1e7ca8713..fec5d6bf3 100644
--- a/cookbooks/hardware/templates/default/ohai.rb.erb
+++ b/cookbooks/hardware/templates/default/ohai.rb.erb
@@ -358,6 +358,8 @@ Ohai.plugin(:Hardware) do
         controller[:device] = File.basename(device).sub(/^cciss(\d+)$/, "/dev/cciss/c\\1d0")
       elsif device = Dir.glob("/sys/bus/pci/devices/#{controller[:pci_slot]}/host*/target*:3:0/*:3:0:0/scsi_generic/sg*").first
         controller[:device] = "/dev/#{File.basename(device)}"
+      elsif device = Dir.glob("/sys/bus/pci/devices/#{controller[:pci_slot]}/host*/target*:1:0/*:1:0:0/scsi_generic/sg*").first
+        controller[:device] = "/dev/#{File.basename(device)}"
       end
     end
   end