Switch to just accepting an Array of IDs

This should work since we have the updated list of descriptions. If it doesn't we'll populate the data with a generic description based on the ID.

Signed-off-by: Tim Smith <tsmith@chef.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/ohai/common/dmi.rb b/lib/ohai/common/dmi.rb
index dc7d30f8..f7298f91 100644
--- a/lib/ohai/common/dmi.rb
+++ b/lib/ohai/common/dmi.rb
@@ -78,13 +78,13 @@ module Ohai
 
       # add additional config defined IDs from the config hash
       if Ohai.config[:additional_dmi_ids]
-        if Ohai.config[:additional_dmi_ids].is_a?(Hash)
-          Ohai.config[:additional_dmi_ids].each_pair do |id, desc|
+        if Ohai.config[:additional_dmi_ids].is_a?(Array)
+          Ohai.config[:additional_dmi_ids].each do |id|
             ID_TO_CAPTURE << id
-            ID_TO_DESCRIPTION[id] = desc
+            ID_TO_DESCRIPTION[id] = "dmi_id_#{id}" unless ID_TO_DESCRIPTION[id]
           end
         else
-          Ohai::Log.debug("The DMI additional_ids config must be a hash of IDs and their description.")
+          Ohai::Log.warn("The DMI plugin additional_dmi_ids config must be array of IDs!")
         end
       end