From 552f1504ae4ae1253554afea2fcfb9f6ac79914a Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Wed, 11 Feb 2009 14:42:16 +1100
Subject: Added support for Oracle Enterprise Linux to operatingsystem and
 operatingsystemrelease

---
 CHANGELOG                            |  3 +++
 lib/facter/operatingsystem.rb        |  2 ++
 lib/facter/operatingsystemrelease.rb | 12 ++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c60317e..8191fe2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
@@ -26,6 +26,18 @@ Facter.add(:operatingsystemrelease) do
     end
 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
-- 
cgit