From 20f6e5f0265f073e038164856944f73b761ec85d Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 1 Oct 2012 19:52:29 +0000
Subject: [PATCH] Add support for Oracle Linux 6.x

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13927 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/anaconda.pm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index 0f2d8b601..57199db64 100644
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -38,9 +38,9 @@ sub handled_commands
 {
     return {
             copycd    => "anaconda",
-            mknetboot => "nodetype:os=(centos.*)|(rh.*)|(fedora.*)|(SL.*)",
-            mkinstall => "nodetype:os=(esxi4.1)|(esx[34].*)|(centos.*)|(rh(?!evh).*)|(fedora.*)|(SL.*)",
-            mkstatelite => "nodetype:os=(esx[34].*)|(centos.*)|(rh.*)|(fedora.*)|(SL.*)",
+            mknetboot => "nodetype:os=(ol.*)|(centos.*)|(rh.*)|(fedora.*)|(SL.*)",
+            mkinstall => "nodetype:os=(esxi4.1)|(esx[34].*)|(ol.*)|(centos.*)|(rh(?!evh).*)|(fedora.*)|(SL.*)",
+            mkstatelite => "nodetype:os=(esx[34].*)|(ol.*)|(centos.*)|(rh.*)|(fedora.*)|(SL.*)",
 	
             };
 }
@@ -1351,6 +1351,7 @@ sub copycd
         and $distname !~ /^centos/
         and $distname !~ /^fedora/
         and $distname !~ /^SL/
+        and $distname !~ /^ol/
         and $distname !~ /^rh/)
     {
 
@@ -1384,6 +1385,13 @@ sub copycd
             $distname =$xCAT::data::discinfo::distnames{$did};
         }
     }
+    elsif ($desc =~ /^Oracle Linux (\d)\.(\d)/)
+    {
+        unless ($distname)
+        {
+            $distname = "ol$1.$2";
+        }
+    }
     elsif ($desc =~ /^Final$/)
     {
         unless ($distname)
@@ -1613,6 +1621,10 @@ sub getplatform {
     {
         $platform = "SL";
     }
+    elsif ($os =~ /ol.*/)
+    {
+        $platform = "ol";
+    }
 
     return $platform;
 }