summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-11-18 14:13:27 -0800
committerTim Smith <tsmith84@gmail.com>2020-11-18 14:13:27 -0800
commit91bce9ae77f036eecc1277dfee6ca9fad9f9f3b8 (patch)
tree408a6bddba4b0bf0db179d39b42e83681b00c820
parent2804463e5e1b81911bc27aa4e132f888a202ff9a (diff)
downloadohai-aix_virtualization.tar.gz
Simplify shellout and chompsaix_virtualization
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/ohai/plugins/aix/virtualization.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ohai/plugins/aix/virtualization.rb b/lib/ohai/plugins/aix/virtualization.rb
index c98d956e..cd724df6 100644
--- a/lib/ohai/plugins/aix/virtualization.rb
+++ b/lib/ohai/plugins/aix/virtualization.rb
@@ -32,8 +32,7 @@ Ohai.plugin(:Virtualization) do
virtualization[:lpar_name] = lpar_name
end
- so = shell_out("uname -W")
- wpar_no = so.stdout.split($/)[0]
+ wpar_no = shell_out("uname -W").stdout.chomp
if wpar_no.to_i > 0
virtualization[:wpar_no] = wpar_no
else
@@ -41,7 +40,7 @@ Ohai.plugin(:Virtualization) do
so = shell_out("lswpar -L").stdout.scan(/={65}.*?(?:EXPORTED\n\n)+/m)
wpars = Mash.new
so.each do |wpar|
- wpar_name = wpar.lines[1].split[0]
+ wpar_name = wpar.lines[1].chomp
wpars[wpar_name] = Mash.new
wpar.scan(/^[A-Z]{4,}.*?[A-Z\:0-9]$.*?\n\n/m).each do |section|