diff options
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | lib/facter/operatingsystem.rb | 2 | ||||
| -rw-r--r-- | lib/facter/operatingsystemrelease.rb | 12 |
3 files changed, 17 insertions, 0 deletions
@@ -1,4 +1,7 @@ 1.5.4: + Added support for Oracle Enterprise Linux to operatingsystem + and operatingsystemrelease + Fixed #1927 - failing facts don't kill Facter Fixed #1850 - Facter updates for Ruby 1.9 diff --git a/lib/facter/operatingsystem.rb b/lib/facter/operatingsystem.rb index 918f119..700ff1f 100644 --- a/lib/facter/operatingsystem.rb +++ b/lib/facter/operatingsystem.rb @@ -22,6 +22,8 @@ Facter.add(:operatingsystem) do "Mandrake" elsif FileTest.exists?("/etc/arch-release") "Archlinux" + elsif FileTest.exists?("/etc/enterprise-release") + "OEL" elsif FileTest.exists?("/etc/redhat-release") txt = File.read("/etc/redhat-release") if txt =~ /centos/i diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb index bbf530a..0afa961 100644 --- a/lib/facter/operatingsystemrelease.rb +++ b/lib/facter/operatingsystemrelease.rb @@ -27,6 +27,18 @@ Facter.add(:operatingsystemrelease) do end Facter.add(:operatingsystemrelease) do + confine :operatingsystem => :oel + setcode do + File::open("/etc/enterprise-release", "r") do |f| + line = f.readline.chomp + if line =~ /release (\d+)/ + $1 + end + end + end +end + +Facter.add(:operatingsystemrelease) do confine :operatingsystem => %w{CentOS} setcode do centos_release = Facter::Util::Resolution.exec("sed -r -e 's/CentOS release //' -e 's/ \((Branch|Final)\)//' /etc/redhat-release") |