summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/facter.rb12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/facter.rb b/lib/facter.rb
index 0d999fa..15dd108 100644
--- a/lib/facter.rb
+++ b/lib/facter.rb
@@ -691,7 +691,7 @@ class Facter
end
Facter.add(:operatingsystemrelease) do
- confine :operatingsystem => %w{RedHat CentOS}
+ confine :operatingsystem => %w{RedHat}
setcode do
File::open("/etc/redhat-release", "r") do |f|
line = f.readline.chomp
@@ -705,6 +705,16 @@ class Facter
end
Facter.add(:operatingsystemrelease) do
+ confine :operatingsystem => %w{CentOS}
+ setcode do
+ release = Resolution.exec('rpm -q centos-release')
+ if release =~ /release-(\d+)/
+ $1
+ end
+ end
+ end
+
+ Facter.add(:operatingsystemrelease) do
setcode do Facter[:kernelrelease].value end
end