From cc78cdd0b29d1d1a966b36dca357392d35597eb7 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 24 Jul 2022 19:31:18 +0100 Subject: [PATCH] Fix PCI address identification for megaraid controllers --- cookbooks/hardware/templates/default/ohai.rb.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbooks/hardware/templates/default/ohai.rb.erb b/cookbooks/hardware/templates/default/ohai.rb.erb index 5f1cee9d7..8c7d633ab 100644 --- a/cookbooks/hardware/templates/default/ohai.rb.erb +++ b/cookbooks/hardware/templates/default/ohai.rb.erb @@ -446,11 +446,11 @@ Ohai.plugin(:Hardware) do devices[:controllers] << controller controllers << controller - elsif line =~ /^Bus Number\s+:\s+(\d+)$/ + elsif line =~ /^Bus Number\s+:\s+([0-9a-f]+)$/i controller[:pci_slot] = format "0000:%02x", Integer("0x#{Regexp.last_match(1)}") - elsif line =~ /^Device Number\s+:\s+(\d+)$/ + elsif line =~ /^Device Number\s+:\s+([0-9a-f]+)$/i controller[:pci_slot] = format "%s:%02x", controller[:pci_slot], Integer("0x#{Regexp.last_match(1)}") - elsif line =~ /^Function Number\s+:\s+(\d+)$/ + elsif line =~ /^Function Number\s+:\s+([0-9a-f]+)$/i controller[:pci_slot] = format "%s.%01x", controller[:pci_slot], Integer("0x#{Regexp.last_match(1)}") end end -- 2.39.5