summaryrefslogtreecommitdiffstats
path: root/lib/facter.rb
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-01-13 01:53:23 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-01-13 01:53:23 +1100
commitb3962ef307678d1be70ece96a284fdd2d63b064d (patch)
tree06686bfbb06987ce60839477ddc86bf742ac94db /lib/facter.rb
parentd7d82fc7f0d19a819cf86cac11a89c0940457d79 (diff)
downloadfacter-b3962ef307678d1be70ece96a284fdd2d63b064d.tar.gz
facter-b3962ef307678d1be70ece96a284fdd2d63b064d.tar.xz
facter-b3962ef307678d1be70ece96a284fdd2d63b064d.zip
Fixed ticket #50 - added selinux facts
Modified operatingsystemrelease fact behaviour for CentOS
Diffstat (limited to 'lib/facter.rb')
-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