From b95c5609791beab9f204c741df80c1e7cbc42777 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 23 Jun 2010 20:12:16 +0000 Subject: [PATCH] -Scientific Linux contributed by Arif Ali git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6589 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/perl/xCAT/Postage.pm | 1 + xCAT-server/lib/perl/xCAT/SvrUtils.pm | 1 + xCAT-server/lib/xcat/plugins/anaconda.pm | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm index 0913a4b8e..bb4a3b17c 100644 --- a/xCAT-server/lib/perl/xCAT/Postage.pm +++ b/xCAT-server/lib/perl/xCAT/Postage.pm @@ -301,6 +301,7 @@ sub makescript { if ($os =~ /rh.*/) { $platform = "rh"; } elsif ($os =~ /centos.*/) { $platform = "centos"; } elsif ($os =~ /fedora.*/) { $platform = "fedora"; } + elsif ($os =~ /sl.*/) { $platform = "sl"; } elsif ($os =~ /sles.*/) { $platform = "sles"; } elsif ($os =~ /aix.*/) { $platform = "aix"; } } diff --git a/xCAT-server/lib/perl/xCAT/SvrUtils.pm b/xCAT-server/lib/perl/xCAT/SvrUtils.pm index 470086360..1a2dad6d5 100644 --- a/xCAT-server/lib/perl/xCAT/SvrUtils.pm +++ b/xCAT-server/lib/perl/xCAT/SvrUtils.pm @@ -319,6 +319,7 @@ sub getsynclistfile() elsif ($os =~ /centos.*/) { $platform = "centos"; } elsif ($os =~ /fedora.*/) { $platform = "fedora"; } elsif ($os =~ /sles.*/) { $platform = "sles"; } + elsif ($os =~ /sl.*/) { $platform = "sl"; } elsif ($os =~ /AIX.*/) { $platform = "AIX"; } } diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 790d290f8..edc802e3f 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -75,9 +75,9 @@ sub handled_commands { return { copycd => "anaconda", - mknetboot => "nodetype:os=(centos.*)|(rh.*)|(fedora.*)", - mkinstall => "nodetype:os=(esx[34].*)|(centos.*)|(rh.*)|(fedora.*)", - mkstatelite => "nodetype:os=(esx[34].*)|(centos.*)|(rh.*)|(fedora.*)", + mknetboot => "nodetype:os=(centos.*)|(rh.*)|(fedora.*)|(sl.*)", + mkinstall => "nodetype:os=(esx[34].*)|(centos.*)|(rh.*)|(fedora.*)|(sl.*)", + mkstatelite => "nodetype:os=(esx[34].*)|(centos.*)|(rh.*)|(fedora.*)|(sl.*)", }; } @@ -948,6 +948,7 @@ sub copycd if ( $distname and $distname !~ /^centos/ and $distname !~ /^fedora/ + and $distname !~ /^sl/ and $distname !~ /^rh/) { @@ -986,6 +987,13 @@ sub copycd $distname = "centos5"; } } + elsif ($desc =~ /^LTS$/) + { + unless ($distname) + { + $distname = "sl5"; + } + } elsif ($desc =~ /^Fedora 8$/) { unless ($distname) @@ -1128,6 +1136,10 @@ sub getplatform { { $platform = "fedora"; } + elsif ($os =~ /sl.*/) + { + $platform = "sl"; + } elsif ($os =~ /esx.*/) { $platform = "esx";