Commit bf675c1f authored by Stephen Delano's avatar Stephen Delano
Browse files

health check: ignore policytool and javaws

parent 47392ff8
...@@ -36,6 +36,12 @@ module Omnibus ...@@ -36,6 +36,12 @@ module Omnibus
/libuutil\.so/ /libuutil\.so/
] ]
WHITELIST_FILES = [
/jre\/bin\/javaws/,
/jre\/bin\/policytool/,
/jre\/lib/
]
WHITELIST_LIBS.push(*SOLARIS_WHITELIST_LIBS) WHITELIST_LIBS.push(*SOLARIS_WHITELIST_LIBS)
def self.run(install_dir) def self.run(install_dir)
...@@ -59,7 +65,9 @@ module Omnibus ...@@ -59,7 +65,9 @@ module Omnibus
WHITELIST_LIBS.each do |reg| WHITELIST_LIBS.each do |reg|
safe ||= true if reg.match(name) safe ||= true if reg.match(name)
end end
safe ||= true if current_library =~ /jre\/lib/ WHITELIST_FILES.each do |reg|
safe ||= true if reg.match(current_library)
end
if !safe && linked !~ Regexp.new(install_dir) if !safe && linked !~ Regexp.new(install_dir)
bad_libs[current_library] ||= {} bad_libs[current_library] ||= {}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment