From 3f43a9a7601b028f15abc81b007333ed4476ea86 Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 29 May 2013 07:23:52 +0000
Subject: [PATCH] fixed bug 3598 for PCM  Ai Lei, support it for rhels5.9.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16443 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/perl/xCAT/Template.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index 5e7c474d5..0e5f38ddd 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -52,6 +52,7 @@ sub subvars {
   my $media_dir = shift;
   my $platform=shift;
   my $partitionfile=shift;
+  my $os=shift;
   my %namedargs = @_; #further expansion of this function will be named arguments, should have happened sooner.
   unless ($namedargs{reusemachinepass}) {
 	$lastmachinepassdata->{password}="";
@@ -111,8 +112,15 @@ sub subvars {
   if ( defined($media_dir) ) {
       @pkgdirs = split(",", $media_dir);
       my $source;
-      my $c = 0;
+      my $c = 0; 
       foreach my $pkgdir(@pkgdirs) {
+          # For rhels5.9, the os base repo should be url
+          # and the repo repository will be the additional.
+          if ( $c == 0 &&  $os =~ /^rhels5/) {
+              $source .=  "url --url http://#TABLE:noderes:\$NODE:nfsserver#/$pkgdir\n";
+              $c++;
+              next; 
+          }
           if( $platform =~ /^(rh|SL)$/ ) { 
               $source .=  "repo --name=pkg$c --baseurl=http://#TABLE:noderes:\$NODE:nfsserver#/$pkgdir\n";
           } elsif ($platform =~ /^(sles|suse)/) {
@@ -352,7 +360,7 @@ sub windows_net_cfg {
 	unless ($hoststab) { $hoststab = xCAT::Table->new('hosts',-create=>1); }
 	my $ulaaddr = autoulaaddress($suffix);
 	$hoststab->setNodeAttribs($node,{ip=>$ulaaddr});
-	return '<component name="Microsoft-Windows-TCPIP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'."\r\n<Interfaces><Interface wcm:action=\"add\">\r\n<Identifier>$mac</Identifier>\r\n<UnicastIpAddresses>\r\n<IpAddress wcm:action=\"add\" wcm:keyValue=\"1\">$ulaaddr/64</IpAddress>\r\n</UnicastIpAddresses>\r\n</Interface>\r\n</Interfaces>\r\n</component>\r\n";
+	return '<component name="Microsoft-Windows-TCPIP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'."\r\n<Interfaces><Interface wcm:action=\"add\">\r\n<Ipv4Settings><DhcpEnabled>false</DhcpEnabled></Ipv4Settings><Ipv6Settings><DhcpEnabled>false</DhcpEnabled></Ipv6Settings>\r\n<Identifier>$mac</Identifier>\r\n<UnicastIpAddresses>\r\n<IpAddress wcm:action=\"add\" wcm:keyValue=\"1\">$ulaaddr/64</IpAddress>\r\n</UnicastIpAddresses>\r\n</Interface>\r\n</Interfaces>\r\n</component>\r\n";
 }
 sub windows_dns_cfg {
 	my $domain;