Skip to content

Commit 4b8bef5

Browse files
committed
Add support for OmniOS (OpenSolaris derivative)
1 parent 7bfd75b commit 4b8bef5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lib/facter/facts/solaris/os/name.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ class Name
99

1010
def call_the_resolver
1111
value = Facter::Resolvers::Uname.resolve(:kernelname)
12-
fact_value = value == 'SunOS' ? 'Solaris' : value
12+
version = Facter::Resolvers::Uname.resolve(:kernelversion)
13+
fact_value = value == 'SunOS' ? (version =~ /^omnios-/ ? 'OmniOS' : 'Solaris') : value
1314

1415
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
1516
end

lib/facter/resolvers/solaris/os_release.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ class OsRelease < BaseResolver
77
init_resolver
88

99
OS_VERSION_REGEX_PATTERNS = ['Solaris \d+ \d+/\d+ s(\d+)[sx]?_u(\d+)wos_',
10-
'Solaris (\d+)[.](\d+)', 'Solaris (\d+)'].freeze
10+
'Solaris (\d+)[.](\d+)', 'Solaris (\d+)',
11+
'OmniOS v(\d+) (r\d+)'].freeze
1112

1213
class << self
1314
private

0 commit comments

Comments
 (0)