diff options
| author | rchanter <robc@nudepenguins.org> | 2008-12-09 04:45:35 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-12-09 22:54:24 +1100 |
| commit | 85b2a55cb245fbdc381e2f00349a6987d167e945 (patch) | |
| tree | a49d4f5a9d7ec4d5c4dcb38522670dcdce369ab9 | |
| parent | 8247304034ae99c715c5cbd3e78931435e04ba89 (diff) | |
| download | facter-85b2a55cb245fbdc381e2f00349a6987d167e945.tar.gz facter-85b2a55cb245fbdc381e2f00349a6987d167e945.tar.xz facter-85b2a55cb245fbdc381e2f00349a6987d167e945.zip | |
minor fix to operatingsystemversion to correctly parse /etc/release on OpenSolaris 2008.11.
| -rw-r--r-- | lib/facter/operatingsystemrelease.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb index a785db6..addd7f2 100644 --- a/lib/facter/operatingsystemrelease.rb +++ b/lib/facter/operatingsystemrelease.rb @@ -76,7 +76,7 @@ end Facter.add(:operatingsystemrelease) do confine :operatingsystem => %w{Solaris} setcode do - full_release = File.readlines("/etc/release").to_s.match(/Solaris \w+ [\w\/]+ ([^_]+_[^_]+)/).to_a.last.chomp("wos") + full_release = File.readlines("/etc/release").to_s.match(/Solaris (\w+ )?[\w\/]+ ([^_]+_[^_]+)/).to_a.last.to_s.chomp("wos") if full_release =~ /^s(\d+)\w(_\w\d)+/ $1 + $2 else |