From 2b0679994e73518c767c559fd1541767c2d5bad9 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Sun, 3 Feb 2008 04:32:55 +1100 Subject: Revert "Fixed ticket #50 - added selinux facts" This reverts commit b3962ef307678d1be70ece96a284fdd2d63b064d. Conflicts: lib/facter.rb --- lib/facter.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/facter.rb b/lib/facter.rb index b87805a..2e39431 100644 --- a/lib/facter.rb +++ b/lib/facter.rb @@ -707,6 +707,7 @@ class Facter end Facter.add(:operatingsystemrelease) do +<<<<<<< HEAD:lib/facter.rb confine :operatingsystem => %w{CentOS} setcode do release = Resolution.exec('rpm -q centos-release') @@ -737,6 +738,8 @@ class Facter end Facter.add(:operatingsystemrelease) do +======= +>>>>>>> b3962ef... Fixed ticket #50 - added selinux facts:lib/facter.rb setcode do Facter[:kernelrelease].value end end -- cgit