diff --git a/lib/ohai/plugins/kernel.rb b/lib/ohai/plugins/kernel.rb index 59665bba5..b3a67fdc2 100644 --- a/lib/ohai/plugins/kernel.rb +++ b/lib/ohai/plugins/kernel.rb @@ -151,6 +151,10 @@ def os_lookup(sys_type) so = shell_out("uname -s") kernel[:os] = so.stdout.split($/)[0] + so = File.open('/etc/release') { |file| file.gets } + md = /(?\d.*\d)/.match(so) + kernel[:update] = md[:update] if md + modules = Mash.new so = shell_out("modinfo") diff --git a/spec/unit/plugins/solaris2/kernel_spec.rb b/spec/unit/plugins/solaris2/kernel_spec.rb index ad6f97688..bddaf7bb9 100644 --- a/spec/unit/plugins/solaris2/kernel_spec.rb +++ b/spec/unit/plugins/solaris2/kernel_spec.rb @@ -139,8 +139,31 @@ allow(@plugin).to receive(:init_kernel).and_return({}) allow(@plugin).to receive(:shell_out).with("uname -s").and_return(mock_shell_out(0, "SunOS\n", "")) allow(@plugin).to receive(:shell_out).with("modinfo").and_return(mock_shell_out(0, MODINFO, "")) + @release = StringIO.new(" Oracle Solaris 10 1/13 s10s_u11wos_24a SPARC\n Assembled 17 January 2013") + allow(File).to receive(:open).with("/etc/release").and_yield(@release) end + it "should give the Solaris update version informtion" do + @release = StringIO.new(" Solaris 10 10/08 s10s_u6wos_07b SPARC\n Use is subject to license terms.\n Assembled 27 October 2008") + allow(File).to receive(:open).with("/etc/release").and_yield(@release) + @plugin.run + expect(@plugin[:kernel][:update]).to eq('10 10/08 s10s_u6wos_07') + end + + it "should give the Oracle Solaris update version informtion" do + @release = StringIO.new(" Oracle Solaris 10 1/13 s10s_u11wos_24a SPARC\n Assembled 17 January 2013") + allow(File).to receive(:open).with("/etc/release").and_yield(@release) + @plugin.run + expect(@plugin[:kernel][:update]).to eq('10 1/13 s10s_u11wos_24') + end + + it "should give the Solaris 11 update version informtion" do + @release = StringIO.new(" Oracle Solaris 11.3 SPARC\n Assembled 25 July 2016") + allow(File).to receive(:open).with("/etc/release").and_yield(@release) + @plugin.run + expect(@plugin[:kernel][:update]).to eq('11.3') + end + it_should_check_from_deep_mash("solaris2::kernel", "kernel", "os", "uname -s", [0, "SunOS\n", ""]) it "gives excruciating detail about kernel modules" do