lib/ohai/plugins/solaris2/virtualization.rb in ohai-16.3.2 vs lib/ohai/plugins/solaris2/virtualization.rb in ohai-16.4.11
- old
+ new
@@ -23,13 +23,11 @@
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
+ shell_out("/usr/sbin/zoneadm list -p").stdout.split(":").first
end
collect_data(:solaris2) do
virtualization Mash.new
virtualization[:systems] = Mash.new
@@ -54,11 +52,10 @@
virtualization[:systems][guest.to_sym] = "guest"
end
if File.executable?("/usr/sbin/zoneadm")
zones = Mash.new
- so = shell_out("zoneadm list -pc")
- so.stdout.lines do |line|
+ shell_out("zoneadm list -pc").stdout.lines do |line|
info = line.chomp.split(/:/)
zones[info[1]] = {
"id" => info[0],
"state" => info[2],
"root" => info[3],