diff options
| author | Joel W. Shea <jwshea@gmail.com> | 2009-02-05 16:52:17 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-02-13 15:55:51 +1100 |
| commit | 94ea80731205da4503ace16a83dd418b43cd3bfb (patch) | |
| tree | ba7a0f827fb827b5fbaccbb49cfb4f1c470a91c3 /lib | |
| parent | 04389db8b4a3a8fe4e737dea48c48afd0d821cf1 (diff) | |
| download | facter-94ea80731205da4503ace16a83dd418b43cd3bfb.tar.gz facter-94ea80731205da4503ace16a83dd418b43cd3bfb.tar.xz facter-94ea80731205da4503ace16a83dd418b43cd3bfb.zip | |
This commit refs #1555, #1898 and fixes #1761
a
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/facter/kernelversion.rb | 5 | ||||
| -rw-r--r-- | lib/facter/operatingsystemrelease.rb | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lib/facter/kernelversion.rb b/lib/facter/kernelversion.rb index 4abb6d6..cac6c14 100644 --- a/lib/facter/kernelversion.rb +++ b/lib/facter/kernelversion.rb @@ -3,3 +3,8 @@ Facter.add("kernelversion") do Facter['kernelrelease'].value.split('-')[0] end end + +Facter.add("kernelversion") do + confine :kernel => :sunos + setcode 'uname -v' +end diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb index e52d47a..1ea2e75 100644 --- a/lib/facter/operatingsystemrelease.rb +++ b/lib/facter/operatingsystemrelease.rb @@ -100,12 +100,5 @@ Facter.add(:operatingsystemrelease) do end Facter.add(:operatingsystemrelease) do - confine :operatingsystem => %w{Solaris} - setcode do - release = Facter::Util::Resolution.exec('uname -v') - end -end - -Facter.add(:operatingsystemrelease) do setcode do Facter[:kernelrelease].value end end |