From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Jan 2016 13:37:04 +0000 (+0000)
Subject: Extract correct device number for Adaptec disks
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/acb36c62a2aa3dde2f0b60c66dacc6ae82145ba2

Extract correct device number for Adaptec disks
---

diff --git a/cookbooks/hardware/templates/default/ohai.rb.erb b/cookbooks/hardware/templates/default/ohai.rb.erb
index b2d56c7d8..5916ecc06 100644
--- a/cookbooks/hardware/templates/default/ohai.rb.erb
+++ b/cookbooks/hardware/templates/default/ohai.rb.erb
@@ -632,7 +632,7 @@ Ohai.plugin(:Hardware) do
           disks << disk
         elsif disk && line =~ /^         Reported Channel,Device\(T:L\)\s*:\s+(\d+),(\d+)\(\d+:0\)\s*$/
           disk[:channel_number] = Regexp.last_match(1)
-          disk[:device_number] = Regexp.last_match(1)
+          disk[:device_number] = Regexp.last_match(2)
         elsif disk && line =~ /^         (\S.*\S)\s*:\s+(\S.*\S)\s*$/
           case Regexp.last_match(1)
           when "Reported Location" then disk[:location] = Regexp.last_match(2)