ohai 6.24.2 → 7.0.0.rc.0

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

@@ -16,37 +16,42 @@
 # limitations under the License.
 #
 
-provides "cpu"
+Ohai.plugin(:CPU) do
+  provides "cpu"
 
-# all dmesg output for smp I can find only provides info about a single processor
-# identical processors is probably a hardware requirement so we'll duplicate data for each cpu
-# old examples: http://www.bnv-bamberg.de/home/ba3294/smp/rbuild/index.htm
-cpuinfo = Mash.new
+  collect_data(:freebsd) do
+    # all dmesg output for smp I can find only provides info about a single processor
+    # identical processors is probably a hardware requirement so we'll duplicate data for each cpu
+    # old examples: http://www.bnv-bamberg.de/home/ba3294/smp/rbuild/index.htm
+    cpuinfo = Mash.new
 
-# /var/run/dmesg.boot
-#CPU: QEMU Virtual CPU version 0.9.1 (1862.02-MHz 686-class CPU)
-#  Origin = "GenuineIntel"  Id = 0x623  Stepping = 3
-#  Features=0x78bfbfd<FPU,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2>
-#  Features2=0x80000001<SSE3,<b31>>
+    # /var/run/dmesg.boot
+    #CPU: QEMU Virtual CPU version 0.9.1 (1862.02-MHz 686-class CPU)
+    #  Origin = "GenuineIntel"  Id = 0x623  Stepping = 3
+    #  Features=0x78bfbfd<FPU,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2>
+    #  Features2=0x80000001<SSE3,<b31>>
 
-File.open("/var/run/dmesg.boot").each do |line|
-  case line
-  when /CPU:\s+(.+) \(([\d.]+).+\)/
-    cpuinfo["model_name"] = $1
-    cpuinfo["mhz"] = $2
-  when /Origin = "(.+)"\s+Id = (.+)\s+Stepping = (.+)/
-    cpuinfo["vendor_id"] = $1
-    cpuinfo["stepping"] = $3
-  # These _should_ match /AMD Features2?/ lines as well 
-  when /Features=.+<(.+)>/
-    cpuinfo["flags"] = $1.downcase.split(',')
-  # Features2=0x80000001<SSE3,<b31>>
-  when /Features2=[a-f\dx]+<(.+)>/
-    cpuinfo["flags"].concat($1.downcase.split(','))
-  when /Logical CPUs per core: (\d+)/
-    cpuinfo["cores"] = $1
+    File.open("/var/run/dmesg.boot").each do |line|
+      case line
+      when /CPU:\s+(.+) \(([\d.]+).+\)/
+        cpuinfo["model_name"] = $1
+        cpuinfo["mhz"] = $2
+      when /Origin = "(.+)"\s+Id = (.+)\s+Stepping = (.+)/
+        cpuinfo["vendor_id"] = $1
+        cpuinfo["stepping"] = $3
+        # These _should_ match /AMD Features2?/ lines as well 
+      when /Features=.+<(.+)>/
+        cpuinfo["flags"] = $1.downcase.split(',')
+        # Features2=0x80000001<SSE3,<b31>>
+      when /Features2=[a-f\dx]+<(.+)>/
+        cpuinfo["flags"].concat($1.downcase.split(','))
+      when /Logical CPUs per core: (\d+)/
+        cpuinfo["cores"] = $1
+      end
+    end
+
+    cpu cpuinfo
+    so = shell_out("sysctl -n hw.ncpu")
+    cpu[:total] = so.stdout.split($/)[0]
   end
 end
-
-cpu cpuinfo
-cpu[:total] = from("sysctl -n hw.ncpu")

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

@@ -16,42 +16,42 @@
 # limitations under the License.
 #
 
-provides "filesystem"
+Ohai.plugin(:Filesystem) do
+  provides "filesystem"
 
-fs = Mash.new
+  collect_data(:freebsd) do
+    fs = Mash.new
 
-# Grab filesystem data from df
-popen4("df") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
-    when /^Filesystem/
-      next
-    when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
-      filesystem = $1
-      fs[filesystem] = Mash.new
-      fs[filesystem][:kb_size] = $2
-      fs[filesystem][:kb_used] = $3
-      fs[filesystem][:kb_available] = $4
-      fs[filesystem][:percent_used] = $5
-      fs[filesystem][:mount] = $6
+    # Grab filesystem data from df
+    so = shell_out("df")
+    so.stdout.lines do |line|
+      case line
+      when /^Filesystem/
+        next
+      when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
+        filesystem = $1
+        fs[filesystem] = Mash.new
+        fs[filesystem][:kb_size] = $2
+        fs[filesystem][:kb_used] = $3
+        fs[filesystem][:kb_available] = $4
+        fs[filesystem][:percent_used] = $5
+        fs[filesystem][:mount] = $6
+      end
     end
-  end
-end
 
-# Grab mount information from mount
-popen4("mount -l") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /^(.+?) on (.+?) \((.+?), (.+?)\)$/
-      filesystem = $1
-      fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
-      fs[filesystem][:mount] = $2
-      fs[filesystem][:fs_type] = $3
-      fs[filesystem][:mount_options] = $4.split(/,\s*/)
+    # Grab mount information from mount
+    so = shell_out("mount -l")
+    so.stdout.lines do |line|
+      if line =~ /^(.+?) on (.+?) \((.+?), (.+?)\)$/
+        filesystem = $1
+        fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
+        fs[filesystem][:mount] = $2
+        fs[filesystem][:fs_type] = $3
+        fs[filesystem][:mount_options] = $4.split(/,\s*/)
+      end
     end
+
+    # Set the filesystem data
+    filesystem fs
   end
 end
-
-# Set the filesystem data
-filesystem fs

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

@@ -16,34 +16,44 @@
 # limitations under the License.
 #
 
-provides "memory"
+Ohai.plugin(:Memory) do
+  provides "memory", "memory/swap"
 
-memory Mash.new
-memory[:swap] = Mash.new
+  collect_data(:freebsd) do
+    memory Mash.new
+    memory[:swap] = Mash.new
 
-# /usr/src/sys/sys/vmmeter.h
-memory[:page_size] = from("sysctl -n vm.stats.vm.v_page_size")
-memory[:page_count] = from("sysctl -n vm.stats.vm.v_page_count")
-memory[:total] = memory[:page_size].to_i * memory[:page_count].to_i
-memory[:free] = memory[:page_size].to_i * from("sysctl -n vm.stats.vm.v_free_count").to_i
-memory[:active] = memory[:page_size].to_i * from("sysctl -n vm.stats.vm.v_active_count").to_i
-memory[:inactive] = memory[:page_size].to_i * from("sysctl -n vm.stats.vm.v_inactive_count").to_i
-memory[:cache] = memory[:page_size].to_i * from("sysctl -n vm.stats.vm.v_cache_count").to_i
-memory[:wired] = memory[:page_size].to_i * from("sysctl -n vm.stats.vm.v_wire_count").to_i
-memory[:buffers] = from("sysctl -n vfs.bufspace")
+    # /usr/src/sys/sys/vmmeter.h
+    so = shell_out("sysctl -n vm.stats.vm.v_page_size")
+    memory[:page_size] = so.stdout.split($/)[0]
+    so = shell_out("sysctl -n vm.stats.vm.v_page_count")
+    memory[:page_count] = so.stdout.split($/)[0]
+    memory[:total] = memory[:page_size].to_i * memory[:page_count].to_i
+    so = shell_out("sysctl -n vm.stats.vm.v_free_count")
+    memory[:free] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    so = shell_out("sysctl -n vm.status.vm.v_active_count")
+    memory[:active] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    so = shell_out("sysctl -n vm.status.vm.v_inactive_count")
+    memory[:inactive] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    so = shell_out("sysctl -n vm.stats.vm.v_cache_count")
+    memory[:cache] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    so = shell_out("sysctl -n vm.stats.vm.v_wire_count")
+    memory[:wired] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    so = shell_out("sysctl -n vfs.bufspace")
+    memory[:buffers] = so.stdout.split($/)[0]
 
-popen4("swapinfo") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    # Device          1K-blocks     Used    Avail Capacity
-    # /dev/ad0s1b        253648        0   253648     0%
-    if line =~ /^([\d\w\/]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+([\d\%]+)/
-      mdev = $1
-      memory[:swap][mdev] = Mash.new
-      memory[:swap][mdev][:total] = $2
-      memory[:swap][mdev][:used] = $3
-      memory[:swap][mdev][:free] = $4
-      memory[:swap][mdev][:percent_free] = $5
+    so = shell_out("swapinfo")
+    so.stdout.lines do |line|
+      # Device          1K-blocks     Used    Avail Capacity
+      # /dev/ad0s1b        253648        0   253648     0%
+      if line =~ /^([\d\w\/]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+([\d\%]+)/
+        mdev = $1
+        memory[:swap][mdev] = Mash.new
+        memory[:swap][mdev][:total] = $2
+        memory[:swap][mdev][:used] = $3
+        memory[:swap][mdev][:free] = $4
+        memory[:swap][mdev][:percent_free] = $5
+      end
     end
   end
 end

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

@@ -16,106 +16,111 @@
 # limitations under the License.
 #
 
-provides "network", "counters/network"
+Ohai.plugin(:Network) do
+  provides "network", "network/interfaces"
+  provides "counters/network", "counters/network/interfaces"
 
-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
+  collect_data(:freebsd) do
+    network Mash.new unless network
+    network[:interfaces] = Mash.new unless network[:interfaces]
+    counters Mash.new unless counters
+    counters[:network] = Mash.new unless counters[:network]
 
-iface = Mash.new
-popen4("/sbin/ifconfig -a") do |pid, stdin, stdout, stderr|
-  stdin.close
-  cint = nil
-  stdout.each do |line|
-    if line =~ /^([0-9a-zA-Z\.]+):\s+/
-      cint = $1
-      iface[cint] = Mash.new
-      if cint =~ /^(\w+)(\d+.*)/
-        iface[cint][:type] = $1
-        iface[cint][:number] = $2
+    so = shell_out("route -n get default")
+    so.stdout.lines do |line|
+      if line =~ /(\w+): ([\w\.]+)/
+        case $1
+        when "gateway"
+          network[:default_gateway] = $2
+        when "interface"
+          network[:default_interface] = $2
+        end
       end
     end
-    # call the family lladdr to match linux for consistency
-    if line =~ /\s+ether (.+?)\s/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][$1] = { "family" => "lladdr" }
-    end
-    if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      # convert the netmask to decimal for consistency
-      netmask = "#{$2[2,2].hex}.#{$2[4,2].hex}.#{$2[6,2].hex}.#{$2[8,2].hex}"
-      if $3.empty?
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask }
-      else
-        # found a broadcast address
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask, "broadcast" => $3 }
+
+    iface = Mash.new
+    so = shell_out("#{ Ohai.abs_path( "/sbin/ifconfig" )} -a")
+    cint = nil
+    so.stdout.lines do |line|
+      if line =~ /^([0-9a-zA-Z\.]+):\s+/
+        cint = $1
+        iface[cint] = Mash.new
+        if cint =~ /^(\w+)(\d+.*)/
+          iface[cint][:type] = $1
+          iface[cint][:number] = $2
+        end
       end
-    end
-    if line =~ /\s+inet6 ([a-f0-9\:]+)%?(\w*)\s+prefixlen\s+(\d+)\s*\w*\s*([\da-fx]*)/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      if $4.empty?
-        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $3 }
-      else
-        # found a zone_id / scope
-        iface[cint][:addresses][$1] = { "family" => "inet6", "zoneid" => $2, "prefixlen" => $3, "scopeid" => $4 }
+      # call the family lladdr to match linux for consistency
+      if line =~ /\s+ether (.+?)\s/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses][$1] = { "family" => "lladdr" }
+      end
+      if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        # convert the netmask to decimal for consistency
+        netmask = "#{$2[2,2].hex}.#{$2[4,2].hex}.#{$2[6,2].hex}.#{$2[8,2].hex}"
+        if $3.empty?
+          iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask }
+        else
+          # found a broadcast address
+          iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask, "broadcast" => $3 }
+        end
+      end
+      if line =~ /\s+inet6 ([a-f0-9\:]+)%?(\w*)\s+prefixlen\s+(\d+)\s*\w*\s*([\da-fx]*)/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        if $4.empty?
+          iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $3 }
+        else
+          # found a zone_id / scope
+          iface[cint][:addresses][$1] = { "family" => "inet6", "zoneid" => $2, "prefixlen" => $3, "scopeid" => $4 }
+        end
+      end
+      if line =~ /flags=\d+<(.+)>/
+        flags = $1.split(',')
+        iface[cint][:flags] = flags if flags.length > 0
+      end
+      if line =~ /metric: (\d+) mtu: (\d+)/
+        iface[cint][:metric] = $1
+        iface[cint][:mtu] = $2
       end
     end
-    if line =~ /flags=\d+<(.+)>/
-      flags = $1.split(',')
-      iface[cint][:flags] = flags if flags.length > 0
-    end
-    if line =~ /metric: (\d+) mtu: (\d+)/
-      iface[cint][:metric] = $1
-      iface[cint][:mtu] = $2
-    end
-  end
-end
 
-popen4("arp -an") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
-      next unless iface[$3] # this should never happen
-      iface[$3][:arp] = Mash.new unless iface[$3][:arp]
-      iface[$3][:arp][$1] = $2.downcase
+    so = shell_out("arp -an")
+    so.stdout.lines do |line|
+      if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
+        next unless iface[$3] # this should never happen
+        iface[$3][:arp] = Mash.new unless iface[$3][:arp]
+        iface[$3][:arp][$1] = $2.downcase
+      end
     end
-  end
-end
 
-network["interfaces"] = iface
+    network["interfaces"] = iface
 
-net_counters = Mash.new
-# From netstat(1), not sure of the implications:
-# Show the state of all network interfaces or a single interface
-# which have been auto-configured (interfaces statically configured
-# into a system, but not located at boot time are not shown). 
-popen4("netstat -ibdn") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    # Name    Mtu Network       Address              Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
-    # ed0    1500 <Link#1>      54:52:00:68:92:85   333604    26  151905886   175472     0   24897542     0  905 
-    # $1                        $2                      $3    $4         $5       $6    $7         $8    $9  $10
-    if line =~ /^([\w\.\*]+)\s+\d+\s+<Link#\d+>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
-      net_counters[$1] = Mash.new unless net_counters[$1]
-      net_counters[$1]["rx"] = Mash.new unless net_counters[$1]["rx"]
-      net_counters[$1]["tx"] = Mash.new unless net_counters[$1]["tx"]
-      net_counters[$1]["rx"]["packets"] = $3
-      net_counters[$1]["rx"]["errors"] = $4
-      net_counters[$1]["rx"]["bytes"] = $5
-      net_counters[$1]["tx"]["packets"] = $6
-      net_counters[$1]["tx"]["errors"] = $7
-      net_counters[$1]["tx"]["bytes"] = $8
-      net_counters[$1]["tx"]["collisions"] = $9
-      net_counters[$1]["tx"]["dropped"] = $10
+    net_counters = Mash.new
+    # From netstat(1), not sure of the implications:
+    # Show the state of all network interfaces or a single interface
+    # which have been auto-configured (interfaces statically configured
+    # into a system, but not located at boot time are not shown). 
+    so = shell_out("netstat -ibdn")
+    so.stdout.lines do |line|
+      # Name    Mtu Network       Address              Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
+      # ed0    1500 <Link#1>      54:52:00:68:92:85   333604    26  151905886   175472     0   24897542     0  905 
+      # $1                        $2                      $3    $4         $5       $6    $7         $8    $9  $10
+      if line =~ /^([\w\.\*]+)\s+\d+\s+<Link#\d+>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
+        net_counters[$1] = Mash.new unless net_counters[$1]
+        net_counters[$1]["rx"] = Mash.new unless net_counters[$1]["rx"]
+        net_counters[$1]["tx"] = Mash.new unless net_counters[$1]["tx"]
+        net_counters[$1]["rx"]["packets"] = $3
+        net_counters[$1]["rx"]["errors"] = $4
+        net_counters[$1]["rx"]["bytes"] = $5
+        net_counters[$1]["tx"]["packets"] = $6
+        net_counters[$1]["tx"]["errors"] = $7
+        net_counters[$1]["tx"]["bytes"] = $8
+        net_counters[$1]["tx"]["collisions"] = $9
+        net_counters[$1]["tx"]["dropped"] = $10
+      end
     end
+
+    counters[:network][:interfaces] = net_counters
   end
 end
-
-counters[:network][:interfaces] = net_counters

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

@@ -16,8 +16,14 @@
 # limitations under the License.
 #
 
-provides "platform", "platform_version"
-
-platform from("uname -s").downcase
-platform_version from("uname -r")
+Ohai.plugin(:Platform) do
+  provides "platform", "platform_version", "platform_family"
 
+  collect_data(:freebsd) do
+    so = shell_out("uname -s")
+    platform so.stdout.split($/)[0].downcase
+    so = shell_out("uname -r")
+    platform_version so.stdout.split($/)[0]
+    platform_family "freebsd"
+  end
+end

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

@@ -16,78 +16,79 @@
 # limitations under the License.
 #
 
-provides "virtualization"
+Ohai.plugin(:Virtualization) do
+  provides "virtualization"
 
-virtualization Mash.new
+  collect_data(:freebsd) do
+    virtualization Mash.new
 
-if from("sysctl -n security.jail.jailed").to_i == 1
-  virtualization[:system] = "jail"
-  virtualization[:role] = "guest"
-end
-
-# detect from modules
-popen4("/sbin/kldstat") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
-    when /vboxdrv/
-      virtualization[:system] = "vbox"
-      virtualization[:role] = "host"
-    when /vboxguest/
-      virtualization[:system] = "vbox"
+    so = shell_out("sysctl -n security.jail.jailed")
+    if so.stdout.split($/)[0].to_i == 1
+      virtualization[:system] = "jail"
       virtualization[:role] = "guest"
     end
-  end
-end
 
+    # detect from modules
+    so = shell_out("#{ Ohai.abs_path( "/sbin/kldstat" )}")
+    so.stdout.lines do |line|
+      case line
+      when /vboxdrv/
+        virtualization[:system] = "vbox"
+        virtualization[:role] = "host"
+      when /vboxguest/
+        virtualization[:system] = "vbox"
+        virtualization[:role] = "guest"
+      end
+    end
 
-# XXX doesn't work when jail is there but not running (ezjail-admin stop)
-if from("jls -n \| wc -l").to_i >= 1
-    virtualization[:system] = "jail"
-    virtualization[:role] = "host"
-end
+    # XXX doesn't work when jail is there but not running (ezjail-admin stop)
+    so = shell_out("jls -n")
+    if ( so.stdout || "" ).lines.count >= 1
+      virtualization[:system] = "jail"
+      virtualization[:role] = "host"
+    end
 
-# KVM Host support for FreeBSD is in development
-# http://feanor.sssup.it/~fabio/freebsd/lkvm/
+    # KVM Host support for FreeBSD is in development
+    # http://feanor.sssup.it/~fabio/freebsd/lkvm/
 
-# Detect KVM/QEMU from cpu, report as KVM
-# hw.model: QEMU Virtual CPU version 0.9.1
-if from("sysctl -n hw.model") =~ /QEMU Virtual CPU/
-  virtualization[:system] = "kvm"
-  virtualization[:role] = "guest"
-end
+    # Detect KVM/QEMU from cpu, report as KVM
+    # hw.model: QEMU Virtual CPU version 0.9.1
+    so = shell_out("sysctl -n hw.model")
+    if so.stdout.split($/)[0] =~ /QEMU Virtual CPU/
+      virtualization[:system] = "kvm"
+      virtualization[:role] = "guest"
+    end
 
-# http://www.dmo.ca/blog/detecting-virtualization-on-linux
-if File.exists?("/usr/local/sbin/dmidecode")
-  popen4("dmidecode") do |pid, stdin, stdout, stderr|
-    stdin.close
-    found_virt_manufacturer = nil
-    found_virt_product = nil
-    stdout.each do |line|
-      case line
-      when /Manufacturer: Microsoft/
-        found_virt_manufacturer = "microsoft"
-      when /Product Name: Virtual Machine/
-        found_virt_product = "microsoft"
-      when /Version: 5.0/
-        if found_virt_manufacturer == "microsoft" && found_virt_product == "microsoft"
-          virtualization[:system] = "virtualpc"
-          virtualization[:role] = "guest"
-        end
-      when /Version: VS2005R2/
-        if found_virt_manufacturer == "microsoft" && found_virt_product == "microsoft"
-          virtualization[:system] = "virtualserver"
-          virtualization[:role] = "guest"
-        end
-      when /Manufacturer: VMware/
-        found_virt_manufacturer = "vmware"
-      when /Product Name: VMware Virtual Platform/
-        if found_virt_manufacturer == "vmware" 
-          virtualization[:system] = "vmware"
-          virtualization[:role] = "guest"
+    # http://www.dmo.ca/blog/detecting-virtualization-on-linux
+    if File.exists?("/usr/local/sbin/dmidecode")
+      so = shell_out("dmidecode")
+      found_virt_manufacturer = nil
+      found_virt_product = nil
+      so.stdout.lines do |line|
+        case line
+        when /Manufacturer: Microsoft/
+          found_virt_manufacturer = "microsoft"
+        when /Product Name: Virtual Machine/
+          found_virt_product = "microsoft"
+        when /Version: 5.0/
+          if found_virt_manufacturer == "microsoft" && found_virt_product == "microsoft"
+            virtualization[:system] = "virtualpc"
+            virtualization[:role] = "guest"
+          end
+        when /Version: VS2005R2/
+          if found_virt_manufacturer == "microsoft" && found_virt_product == "microsoft"
+            virtualization[:system] = "virtualserver"
+            virtualization[:role] = "guest"
+          end
+        when /Manufacturer: VMware/
+          found_virt_manufacturer = "vmware"
+        when /Product Name: VMware Virtual Platform/
+          if found_virt_manufacturer == "vmware" 
+            virtualization[:system] = "vmware"
+            virtualization[:role] = "guest"
+          end
         end
       end
     end
   end
 end
-