lib/ohai/plugins/kernel.rb in ohai-16.5.6 vs lib/ohai/plugins/kernel.rb in ohai-16.6.5

- old
+ new

@@ -154,10 +154,14 @@ "free_space_in_paging_files", # already in memory plugin "free_virtual_memory", # already in memory plugin ].include?(name) end + collect_data(:target) do + # intentionally left blank + end + collect_data(:default) do kernel init_kernel end collect_data(:darwin) do @@ -202,12 +206,12 @@ so = shell_out("env lsmod") so.stdout.lines do |line| if line =~ /([a-zA-Z0-9\_]+)\s+(\d+)\s+(\d+)/ modules[$1] = { size: $2, refcount: $3 } # Making sure to get the module version that has been loaded - if File.exist?("/sys/module/#{$1}/version") - version = File.read("/sys/module/#{$1}/version").chomp.strip + if file_exist?("/sys/module/#{$1}/version") + version = file_read("/sys/module/#{$1}/version").chomp.strip modules[$1]["version"] = version unless version.empty? end end end @@ -228,10 +232,10 @@ kernel init_kernel so = shell_out("uname -s") kernel[:os] = so.stdout.split($/)[0] - so = File.open("/etc/release", &:gets) + so = file_open("/etc/release", &:gets) md = /(?<update>\d.*\d)/.match(so) kernel[:update] = md[:update] if md modules = Mash.new