From b3962ef307678d1be70ece96a284fdd2d63b064d Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Sun, 13 Jan 2008 01:53:23 +1100 Subject: Fixed ticket #50 - added selinux facts Modified operatingsystemrelease fact behaviour for CentOS --- lib/facter.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'lib/facter.rb') 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 @@ -704,6 +704,16 @@ class Facter end 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 -- cgit