ohai 0.5.8 → 0.6.0.beta.0

data/lib/ohai/plugins/ec2.rb

@@ -19,78 +19,26 @@
 
 provides "ec2"
 
-require 'open-uri'
-require 'socket'
+require 'ohai/mixin/ec2_metadata'
 
 require_plugin "hostname"
 require_plugin "kernel"
 require_plugin "network"
 
-EC2_METADATA_ADDR = "169.254.169.254" unless defined?(EC2_METADATA_ADDR)
-EC2_METADATA_URL = "http://#{EC2_METADATA_ADDR}/2008-02-01/meta-data" unless defined?(EC2_METADATA_URL)
-EC2_USERDATA_URL = "http://#{EC2_METADATA_ADDR}/2008-02-01/user-data" unless defined?(EC2_USERDATA_URL)
-EC2_ARRAY_VALUES = %w(security-groups)
-
-def can_metadata_connect?(addr, port, timeout=2)
-  t = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
-  saddr = Socket.pack_sockaddr_in(port, addr)
-  connected = false
-
-  begin
-    t.connect_nonblock(saddr)    
-  rescue Errno::EINPROGRESS
-    r,w,e = IO::select(nil,[t],nil,timeout)
-    if !w.nil?
-      connected = true
-    else
-      begin
-        t.connect_nonblock(saddr)
-      rescue Errno::EISCONN
-        t.close
-        connected = true
-      rescue SystemCallError
-      end
-    end
-  rescue SystemCallError
-  end
-
-  connected
-end
+extend Ohai::Mixin::Ec2Metadata
 
 def has_ec2_mac?
   network[:interfaces].values.each do |iface|
     unless iface[:arp].nil?
-      return true if iface[:arp].value?("fe:ff:ff:ff:ff:ff")
+      has_mac = iface[:arp].value?("fe:ff:ff:ff:ff:ff")
+      Ohai::Log.debug("has_ec2_mac? == true")
+      return true if has_mac
     end
   end
+  Ohai::Log.debug("has_ec2_mac? == false")
   false
 end
 
-def metadata(id='')
-  OpenURI.open_uri("#{EC2_METADATA_URL}/#{id}").read.split("\n").each do |o|
-    key = "#{id}#{o.gsub(/\=.*$/, '/')}"
-    if key[-1..-1] != '/'
-      ec2[key.gsub(/\-|\//, '_').to_sym] = 
-        if EC2_ARRAY_VALUES.include? key
-          OpenURI.open_uri("#{EC2_METADATA_URL}/#{key}").read.split("\n")
-        else
-          OpenURI.open_uri("#{EC2_METADATA_URL}/#{key}").read
-        end
-    else
-      metadata(key)
-    end
-  end
-end
-
-def userdata()
-  ec2[:userdata] = nil
-  # assumes the only expected error is the 404 if there's no user-data
-  begin
-    ec2[:userdata] = OpenURI.open_uri("#{EC2_USERDATA_URL}/").read
-  rescue OpenURI::HTTPError
-  end
-end
-
 def looks_like_ec2?
   # Try non-blocking connect so we don't "block" if 
   # the Xen environment is *not* EC2
@@ -98,8 +46,11 @@ def looks_like_ec2?
 end
 
 if looks_like_ec2?
+  Ohai::Log.debug("looks_like_ec2? == true")
   ec2 Mash.new
-  self.metadata
-  self.userdata
+  self.fetch_metadata.each {|k, v| ec2[k] = v }
+  ec2[:userdata] = self.fetch_userdata
+else
+  Ohai::Log.debug("looks_like_ec2? == false")
+  false
 end
-

data/lib/ohai/plugins/eucalyptus.rb

@@ -0,0 +1,65 @@
+#
+# Author:: Tim Dysinger (<tim@dysinger.net>)
+# Author:: Benjamin Black (<bb@opscode.com>)
+# Author:: Christopher Brown (<cb@opscode.com>)
+# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+provides "eucalyptus"
+
+require 'ohai/mixin/ec2_metadata'
+
+require_plugin "hostname"
+require_plugin "kernel"
+require_plugin "network"
+
+extend Ohai::Mixin::Ec2Metadata
+
+def get_mac_address(addresses)
+  detected_addresses = addresses.detect { |address, keypair| keypair == {"family"=>"lladdr"} }
+  if detected_addresses
+    return detected_addresses.first
+  else
+    return ""
+  end
+end
+
+def has_euca_mac?
+  network[:interfaces].values.each do |iface|
+    has_mac = (get_mac_address(iface[:addresses]) =~ /^[dD]0:0[dD]:/)
+    Ohai::Log.debug("has_euca_mac? == #{!!has_mac}")
+    return true if has_mac
+  end
+
+  Ohai::Log.debug("has_euca_mac? == false")
+  false
+end
+
+def looks_like_euca?
+  # Try non-blocking connect so we don't "block" if 
+  # the Xen environment is *not* EC2
+  has_euca_mac? && can_metadata_connect?(EC2_METADATA_ADDR,80)
+end
+
+if looks_like_euca?
+  Ohai::Log.debug("looks_like_euca? == true")
+  eucalyptus Mash.new
+  self.fetch_metadata.each {|k, v| eucalyptus[k] = v }
+  eucalyptus[:userdata] = self.fetch_userdata
+else
+  Ohai::Log.debug("looks_like_euca? == false")
+  false
+end
+

data/lib/ohai/plugins/freebsd/network.rb

@@ -18,7 +18,16 @@
 
 provides "network", "counters/network"
 
-network[:default_interface] = from("route -n get default \| grep interface: \| awk \'/: / \{print \$2\}\'")
+from("route -n get default").split("\n").each do |line|
+  if line =~ /(\w+): ([\w\.]+)/
+    case $1
+    when "gateway"
+      network[:default_gateway] = $2
+    when "interface"
+      network[:default_interface] = $2
+    end
+  end
+end
 
 iface = Mash.new
 popen4("/sbin/ifconfig -a") do |pid, stdin, stdout, stderr|
@@ -109,4 +118,4 @@ popen4("netstat -ibdn") do |pid, stdin, stdout, stderr|
   end
 end
 
-counters[:network][:interfaces] = net_counters
+counters[:network][:interfaces] = net_counters

data/lib/ohai/plugins/java.rb

@@ -28,10 +28,10 @@ if status == 0
     case line
     when /java version \"([0-9\.\_]+)\"/
       java[:version] = $1
-    when /^(.+Runtime Environment.*) \(build (.+)\)$/
-      java[:runtime] = { "name" => $1, "build" => $2 }
-    when /^(.+ Client VM) \(build (.+)\)$/ 
-      java[:hotspot] = { "name" => $1, "build" => $2 }
+    when /^(.+Runtime Environment.*) \((build )?(.+)\)$/
+      java[:runtime] = { "name" => $1, "build" => $3 }
+    when /^(.+ (Client|Server) VM) \(build (.+)\)$/
+      java[:hotspot] = { "name" => $1, "build" => $3 }
     end
   end
 

data/lib/ohai/plugins/linux/filesystem.rb

@@ -53,5 +53,29 @@ popen4("mount -l") do |pid, stdin, stdout, stderr|
   end
 end
 
+# Grab UUID from /dev/disk/by-uuid/*
+popen4("ls -l /dev/disk/by-uuid/* | awk '{print $11, $9}'") do |pid, stdin, stdout, stderr|
+  stdin.close
+  stdout.each do |line|
+    if line =~ /^[.\/]+\/([a-z]+\d) \/.\/(.)$/
+      filesystem = "/dev/" + $1
+      fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
+      fs[filesystem][:uuid] = $2
+    end
+  end
+end
+
+# Grab any missing mount information from /proc/mounts
+File.open('/proc/mounts').each do |line|
+  if line =~ /^(\S+) (\S+) (\S+) (\S+) \S+ \S+$/
+    filesystem = $1
+    next if fs.has_key?(filesystem)
+    fs[filesystem] = Mash.new
+    fs[filesystem][:mount] = $2
+    fs[filesystem][:fs_type] = $3
+    fs[filesystem][:mount_options] = $4.split(",")
+  end
+end
+
 # Set the filesystem data
 filesystem fs

data/lib/ohai/plugins/linux/network.rb

@@ -18,7 +18,17 @@
 
 provides "network", "counters/network"
 
-network[:default_interface] = from("route -n \| grep -m 1 ^0.0.0.0 \| awk \'{print \$8\}\'")
+begin
+  route_result = from("route -n \| grep -m 1 ^0.0.0.0").split(/[ \t]+/)
+  if route_result.last =~ /(venet\d+)/
+    network[:default_interface] = from("ip addr show dev #{$1} | grep -v 127.0.0.1 | grep -m 1 inet").split(/[ \t]+/).last
+    network[:default_gateway] = route_result[1]
+  else
+    network[:default_gateway], network[:default_interface] = route_result.values_at(1,7)
+  end
+rescue Ohai::Exceptions::Exec
+  Ohai::Log.debug("Unable to determine default interface")
+end
 
 def encaps_lookup(encap)
   return "Loopback" if encap.eql?("Local Loopback")
@@ -74,6 +84,9 @@ popen4("ifconfig -a") do |pid, stdin, stdout, stderr|
     if line =~ /MTU:(\d+)/
       iface[cint][:mtu] = $1
     end
+    if line =~ /P-t-P:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
+      iface[cint][:peer] = $1
+    end
     if line =~ /RX packets:(\d+) errors:(\d+) dropped:(\d+) overruns:(\d+) frame:(\d+)/
       net_counters[cint] = Mash.new unless net_counters[cint]
       net_counters[cint][:rx] = { "packets" => $1, "errors" => $2, "drop" => $3, "overrun" => $4, "frame" => $5 }

data/lib/ohai/plugins/linux/platform.rb

@@ -47,6 +47,9 @@ elsif File.exists?('/etc/gentoo-release')
 elsif File.exists?('/etc/SuSE-release')
   platform "suse"
   platform_version File.read("/etc/SuSE-release").scan(/VERSION = (\d+)\nPATCHLEVEL = (\d+)/).flatten.join(".")
+elsif File.exists?('/etc/slackware-version')
+  platform "slackware"
+  platform_version File.read("/etc/slackware-version").scan(/(\d+|\.+)/).join
 elsif File.exists?('/etc/arch-release')
   platform "arch"
   # no way to determine platform_version in a rolling release distribution

data/lib/ohai/plugins/linux/virtualization.rb

@@ -23,17 +23,17 @@ virtualization Mash.new
 # if it is possible to detect paravirt vs hardware virt, it should be put in
 # virtualization[:mechanism]
 if File.exists?("/proc/xen/capabilities") && File.read("/proc/xen/capabilities") =~ /control_d/i
-    virtualization[:emulator] = "xen"
+    virtualization[:system] = "xen"
     virtualization[:role] = "host"
 elsif File.exists?("/proc/sys/xen/independent_wallclock")
-  virtualization[:emulator] = "xen"
+  virtualization[:system] = "xen"
   virtualization[:role] = "guest"
 end
 
 # Detect KVM hosts by kernel module
 if File.exists?("/proc/modules")
   if File.read("/proc/modules") =~ /^kvm/
-    virtualization[:emulator] = "kvm"
+    virtualization[:system] = "kvm"
     virtualization[:role] = "host"
   end
 end
@@ -45,7 +45,7 @@ end
 # Wait for reply to: http://article.gmane.org/gmane.comp.emulators.kvm.devel/27885
 if File.exists?("/proc/cpuinfo")
   if File.read("/proc/cpuinfo") =~ /QEMU Virtual CPU/
-    virtualization[:emulator] = "kvm"
+    virtualization[:system] = "kvm"
     virtualization[:role] = "guest"
   end
 end
@@ -58,17 +58,39 @@ if File.exists?("/usr/sbin/dmidecode")
     case dmi_info
     when /Manufacturer: Microsoft/
       if dmi_info =~ /Product Name: Virtual Machine/ 
-        virtualization[:emulator] = "virtualpc"
+        virtualization[:system] = "virtualpc"
         virtualization[:role] = "guest"
       end 
     when /Manufacturer: VMware/
       if dmi_info =~ /Product Name: VMware Virtual Platform/ 
-        virtualization[:emulator] = "vmware"
+        virtualization[:system] = "vmware"
         virtualization[:role] = "guest"
       end
+    when /Manufacturer: Xen/
+      if dmi_info =~ /Product Name: HVM domU/
+        virtualization[:system] = "xen"
+        virtualization[:role] = "guest"  
+      end
     else
       nil
     end
 
   end
 end
+
+# Detect Linux-VServer
+if File.exists?("/proc/self/status")
+  proc_self_status = File.read("/proc/self/status")
+  vxid = proc_self_status.match(/^(s_context|VxID): (\d+)$/)
+  if vxid and vxid[2]
+    virtualization[:system] = "linux-vserver"
+    if vxid[2] == "0"
+      virtualization[:role] = "host"
+    else
+      virtualization[:role] = "guest"
+     end
+  end
+end
+
+# Detect OpenVZ
+# something in /proc/vz/veinfo

data/lib/ohai/plugins/netbsd/network.rb

@@ -18,7 +18,16 @@
 
 provides "network", "counters/network"
 
-network[:default_interface] = from("route -n get default \| grep interface: \| awk \'/: / \{print \$2\}\'")
+from("route -n get default").split("\n").each do |line|
+  if line =~ /(\w+): ([\w\.]+)/
+    case $1
+    when "gateway"
+      network[:default_gateway] = $2
+    when "interface"
+      network[:default_interface] = $2
+    end
+  end
+end
 
 iface = Mash.new
 popen4("/sbin/ifconfig -a") do |pid, stdin, stdout, stderr|

data/lib/ohai/plugins/network.rb

@@ -36,13 +36,15 @@ def find_ip_and_mac(addresses)
   [ip, mac]
 end
 
-unless network[:default_interface].nil?
+if network[:default_interface]
+  Ohai::Log.debug("Using default interface for default ip and mac address")
   im = find_ip_and_mac(network["interfaces"][network[:default_interface]]["addresses"])
   ipaddress im.shift
   macaddress im.shift
 else
   network["interfaces"].keys.sort.each do |iface|
     if network["interfaces"][iface]["encapsulation"].eql?("Ethernet")
+      Ohai::Log.debug("Picking ip and mac address from first Ethernet interface")
       im = find_ip_and_mac(network["interfaces"][iface]["addresses"])
       ipaddress im.shift
       macaddress im.shift

data/lib/ohai/plugins/ohai.rb

@@ -22,3 +22,4 @@ provides "ohai"
 self[:chef_packages] = Mash.new unless self[:chef_packages]
 self[:chef_packages][:ohai] = Mash.new
 self[:chef_packages][:ohai][:version] = Ohai::VERSION
+self[:chef_packages][:ohai][:ohai_root] = Ohai::OHAI_ROOT

data/lib/ohai/plugins/openbsd/network.rb

@@ -18,7 +18,16 @@
 
 provides "network", "counters/network"
 
-network[:default_interface] = from("route -n get default \| grep interface: \| awk \'/: / \{print \$2\}\'")
+from("route -n get default").split("\n").each do |line|
+  if line =~ /(\w+): ([\w\.]+)/
+    case $1
+    when "gateway"
+      network[:default_gateway] = $2
+    when "interface"
+      network[:default_interface] = $2
+    end
+  end
+end
 
 iface = Mash.new
 popen4("/sbin/ifconfig -a") do |pid, stdin, stdout, stderr|

data/lib/ohai/plugins/ruby.rb

@@ -58,7 +58,7 @@ result = run_ruby "puts %Q(#{env_string})"
 # Parse results to plugin hash
 result.split(',').each do |entry|
  key, value = entry.split('=')
- languages[:ruby][key.to_sym] = value
+ languages[:ruby][key.to_sym] = value || ""
 end
 
 # Perform one more (conditional) query

data/lib/ohai/plugins/sigar/filesystem.rb

@@ -36,6 +36,8 @@ sigar.file_system_list.each do |fsys|
     fs[filesystem][:kb_used] = ((usage.total - usage.free) / 1024).to_s
     fs[filesystem][:kb_available] = (usage.free / 1024).to_s
     fs[filesystem][:percent_used] = (usage.use_percent * 100).to_s + '%'
+  rescue SystemExit => e
+    raise
   rescue Exception => e
     #e.g. floppy or cdrom drive
   end

data/lib/ohai/plugins/solaris2/dmi.rb

@@ -0,0 +1,176 @@
+#
+# Author:: Kurt Yoder (ktyopscode@yoderhome.com)
+# Copyright:: Copyright (c) 2010 Kurt Yoder
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_plugin "dmi"
+
+# if we already have a "dmi" with keys (presumably from dmidecode), don't try smbios
+# note that a single key just means dmidecode exited with its version
+if (dmi.class.to_s == 'Mash') and (dmi.keys.length > 1) 
+  Ohai::Log.debug('skipping smbios output, since DMI information has already been provided')
+  return
+end
+
+dmi Mash.new
+
+# bad Solaris shows strings defined by system instead of SMB IDs 
+# this is what the *real* IDs are:
+# pulled from http://src.opensolaris.org/source/xref/nwam/nwam1/usr/src/uts/common/sys/smbios.h
+smb_to_id = {
+  'SMB_TYPE_BIOS' =>         0, # BIOS information (R)
+  'SMB_TYPE_SYSTEM' =>       1, # system information (R)
+  'SMB_TYPE_BASEBOARD' =>    2, # base board
+  'SMB_TYPE_CHASSIS' =>      3, # system enclosure or chassis (R)
+  'SMB_TYPE_PROCESSOR' =>    4, # processor (R)
+  'SMB_TYPE_MEMCTL' =>       5, # memory controller (O)
+  'SMB_TYPE_MEMMOD' =>       6, # memory module (O)
+  'SMB_TYPE_CACHE' =>        7, # processor cache (R)
+  'SMB_TYPE_PORT' =>         8, # port connector
+  'SMB_TYPE_SLOT' =>         9, # upgradeable system slot (R)
+  'SMB_TYPE_OBDEVS' =>       10, # on-board devices
+  'SMB_TYPE_OEMSTR' =>       11, # OEM string table
+  'SMB_TYPE_SYSCONFSTR' =>   12, # system configuration string table
+  'SMB_TYPE_LANG' =>         13, # BIOS language information
+  'SMB_TYPE_GROUP' =>        14, # group associations
+  'SMB_TYPE_EVENTLOG' =>     15, # system event log
+  'SMB_TYPE_MEMARRAY' =>     16, # physical memory array (R)
+  'SMB_TYPE_MEMDEVICE' =>    17, # memory device (R)
+  'SMB_TYPE_MEMERR32' =>     18, # 32-bit memory error information
+  'SMB_TYPE_MEMARRAYMAP' =>  19, # memory array mapped address (R)
+  'SMB_TYPE_MEMDEVICEMAP' => 20, # memory device mapped address (R)
+  'SMB_TYPE_POINTDEV' =>     21, # built-in pointing device
+  'SMB_TYPE_BATTERY' =>      22, # portable battery
+  'SMB_TYPE_RESET' =>        23, # system reset settings
+  'SMB_TYPE_SECURITY' =>     24, # hardware security settings
+  'SMB_TYPE_POWERCTL' =>     25, # system power controls
+  'SMB_TYPE_VPROBE' =>       26, # voltage probe
+  'SMB_TYPE_COOLDEV' =>      27, # cooling device
+  'SMB_TYPE_TPROBE' =>       28, # temperature probe
+  'SMB_TYPE_IPROBE' =>       29, # current probe
+  'SMB_TYPE_OOBRA' =>        30, # out-of-band remote access facility
+  'SMB_TYPE_BIS' =>          31, # boot integrity services
+  'SMB_TYPE_BOOT' =>         32, # system boot status (R)
+  'SMB_TYPE_MEMERR64' =>     33, # 64-bit memory error information
+  'SMB_TYPE_MGMTDEV' =>      34, # management device
+  'SMB_TYPE_MGMTDEVCP' =>    35, # management device component
+  'SMB_TYPE_MGMTDEVDATA' =>  36, # management device threshold data
+  'SMB_TYPE_MEMCHAN' =>      37, # memory channel
+  'SMB_TYPE_IPMIDEV' =>      38, # IPMI device information
+  'SMB_TYPE_POWERSUP' =>     39, # system power supply
+  'SMB_TYPE_INACTIVE' =>     126, # inactive table entry
+  'SMB_TYPE_EOT' =>          127, # end of table
+  'SMB_TYPE_OEM_LO' =>       128, # start of OEM-specific type range
+  'SUN_OEM_EXT_PROCESSOR' => 132, # processor extended info
+  'SUN_OEM_PCIEXRC' =>       138, # PCIE RootComplex/RootPort info
+  'SUN_OEM_EXT_MEMARRAY' =>  144, # phys memory array extended info
+  'SUN_OEM_EXT_MEMDEVICE' => 145, # memory device extended info
+  'SMB_TYPE_OEM_HI' =>       256, # end of OEM-specific type range
+}
+
+# all output lines should fall within one of these patterns
+header_type_line = /^ID\s+SIZE\s+TYPE/
+header_information_line = /^(\d+)\s+(\d+)\s+(\S+)\s+\(([^\)]+)\)/
+blank_line = /^\s*$/
+data_key_value_line = /^  ([^:]+): (.*)/
+data_key_only_line = /^  (\S.*)(:\s*)?$/
+extended_data_line = /^\t(\S+) \((.+)\)/
+
+dmi_record = nil
+field = nil
+
+popen4("smbios") do |pid, stdin, stdout, stderr|
+  stdin.close
+  
+  # ==== EXAMPLE: ====
+  # ID    SIZE TYPE
+  # 0     40   SMB_TYPE_BIOS (BIOS information)
+  # 
+  #   Vendor: HP
+  #   Version String: 2.16  
+  # ... similar lines trimmed
+  #   Characteristics: 0x7fc9da80
+  #         SMB_BIOSFL_PCI (PCI is supported)
+  # ... similar lines trimmed
+  # note the second level of indentation is via a *tab*
+  stdout.each do |raw_line|
+    next if header_type_line.match(raw_line)
+    next if blank_line.match(raw_line)
+
+    # remove/replace any characters that don't fall inside permissible ASCII range, or whitespace
+    line = raw_line.gsub(/[^\x20-\x7E\n\t\r]/, '.')
+    if (line != raw_line)
+      Ohai::Log.debug("converted characters from line:\n#{raw_line}")
+    end
+
+    if header_information = header_information_line.match(line)
+      dmi_record = {}
+
+      # look up SMB ID
+      if smb_to_id.has_key?(header_information[3])
+        dmi_record[:type] = DMI.id_lookup(smb_to_id[header_information[3]])
+
+      else
+        dmi_record[:type] = header_information[3].downcase
+        Ohai::Log.debug("unrecognized header type; falling back to #{dmi_record[:type]}")
+      end
+
+      dmi[dmi_record[:type]] = Mash.new unless dmi.has_key?(dmi_record[:type])
+      dmi[dmi_record[:type]][:all_records] = [] unless dmi[dmi_record[:type]].has_key?(:all_records)
+      dmi_record[:position] = dmi[dmi_record[:type]][:all_records].length
+      dmi[dmi_record[:type]][:all_records].push(Mash.new)
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:record_id] = header_information[1]
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:size] = header_information[2]
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:application_identifier] = header_information[4]
+      field = nil
+    
+    elsif data = data_key_value_line.match(line)
+      if dmi_record == nil
+        Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
+        next
+      end
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = data[2]
+      field = data[1]
+    
+    elsif data = data_key_only_line.match(line)
+      if dmi_record == nil
+        Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
+        next
+      end
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = ''
+      field = data[1]
+    
+    elsif extended_data = extended_data_line.match(line)
+      if dmi_record == nil
+        Ohai::Log.debug("unexpected extended data line found before header; discarding:\n#{line}")
+        next
+      end
+      if field == nil
+        Ohai::Log.debug("unexpected extended data line found outside data section; discarding:\n#{line}")
+        next
+      end
+      # overwrite "raw" value with a new Mash
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].class.to_s == 'Mash'
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = extended_data[2]
+
+    else
+      Ohai::Log.debug("unrecognized output line; discarding:\n#{line}")
+
+    end
+  end
+end
+
+DMI.convenience_keys(dmi)