lib/ohai/plugins/solaris2/virtualization.rb in ohai-14.15.0 vs lib/ohai/plugins/solaris2/virtualization.rb in ohai-15.0.35

@@ -20,10 +20,11 @@
 
 Ohai.plugin(:Virtualization) do
   require "ohai/mixin/dmi_decode"
   include Ohai::Mixin::DmiDecode
   provides "virtualization"
+  depends "dmi"
 
   def collect_solaris_guestid
     command = "/usr/sbin/zoneadm list -p"
     so = shell_out(command)
     so.stdout.split(":").first
@@ -42,19 +43,16 @@
         virtualization[:role] = "guest"
         virtualization[:systems][:kvm] = "guest"
       end
     end
 
-    # Pass smbios information to the dmi_decode mixin to
-    # identify possible virtualization systems
-    smbios_path = Ohai.abs_path("/usr/sbin/smbios")
-    if File.exist?(smbios_path)
-      guest = guest_from_dmi(shell_out(smbios_path).stdout)
-      if guest
-        virtualization[:system] = guest
-        virtualization[:role] = "guest"
-        virtualization[:systems][guest.to_sym] = "guest"
-      end
+    # parse dmi to discover various virtualization guests
+    guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product), get_attribute(:dmi, :system, :version))
+    if guest
+      logger.trace("Plugin Virtualization: DMI data indicates #{guest} guest")
+      virtualization[:system] = guest
+      virtualization[:role] = "guest"
+      virtualization[:systems][guest.to_sym] = "guest"
     end
 
     if File.executable?("/usr/sbin/zoneadm")
       zones = Mash.new
       so = shell_out("zoneadm list -pc")