diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-02-03 04:32:55 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-02-03 04:32:55 +1100 |
| commit | 2b0679994e73518c767c559fd1541767c2d5bad9 (patch) | |
| tree | 94592559c90c4797e0e0d5d3be59b9ff7b886306 /lib/facter.rb | |
| parent | ecc1f0ca4f5f91c6e3aec6cfb3012687b7b97563 (diff) | |
| download | facter-2b0679994e73518c767c559fd1541767c2d5bad9.tar.gz facter-2b0679994e73518c767c559fd1541767c2d5bad9.tar.xz facter-2b0679994e73518c767c559fd1541767c2d5bad9.zip | |
Revert "Fixed ticket #50 - added selinux facts"
This reverts commit b3962ef307678d1be70ece96a284fdd2d63b064d.
Conflicts:
lib/facter.rb
Diffstat (limited to 'lib/facter.rb')
| -rw-r--r-- | lib/facter.rb | 3 |
1 files changed, 3 insertions, 0 deletions
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 |