This commit refs #1555, #1898 and fixes #1761

a

3 files changed, 10 insertions, 7 deletions

diff --git a/CHANGELOG b/CHANGELOG
index e1cb388..b23adfb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,9 @@
 1.5.4:
+    Changes to Solaris facts:
+       operatingsystemrelease == kernel release or uname -r
+       kernelrelease == uname -r 
+       kernelversion == uname -v
+
     Added support for Oracle VM Server to operatingsystem
     and operatingsystemrelease
 
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