From 1a71e22953e6cd54d8130b9b69f148afd89e34c6 Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 22 Jul 2009 18:55:53 +0000
Subject: [PATCH] user otherpkgs to install xCATsn on the service node

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3866 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../xcat/install/sles/service.sles11.tmpl     |  1 +
 xCAT/postscripts/servicenode                  | 20 +++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/xCAT-server/share/xcat/install/sles/service.sles11.tmpl b/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
index dc3835b0c..0121595f7 100644
--- a/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
+++ b/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
@@ -57,6 +57,7 @@
         <package>bind</package>
         <package>perl-Expect</package>
         <package>perl-SNMP</package>
+        <package>dhcp-server</package>
       </packages>
     </software>
   </install>
diff --git a/xCAT/postscripts/servicenode b/xCAT/postscripts/servicenode
index 117f05da5..39859ea33 100755
--- a/xCAT/postscripts/servicenode
+++ b/xCAT/postscripts/servicenode
@@ -74,24 +74,10 @@ else
         if ( -f "/etc/SuSE-release") { #special case for SLES11
             &runcmd("rpm -e perl-doc"); #perl-doc conflicts with perl-Version which will be installed
         }
-        &runcmd("rpm -ivh /xcatpost/xcat/RPMS/*/*.rpm");
+        my $osver=$ENV{'OSVER'};
+        my $arch=$ENV{'ARCH'};
+        &runcmd("OTHERPKGS=xcat/core-snap/xCATsn,xcat/xcat-dep/$osver/$arch/conserver /xcatpost/otherpkgs");
     }
-    #if ($ENV{'NODESETSTATE'} eq "install")
-    #{
-    #		$msg = "Installing xCAT";
-    #		`logger -t xcat $msg`;
-    #        if(-f "/etc/SuSE-release") {
-    ##            # `pkill -9 y2base`;
-    #            $msg = "xCATsn for SuSE";
-    #            `logger -t xCAT $msg`;
-                #$msg=`zypper ar -t plaindir file:/xcatpost/xcat/RPMS xcatsn > /root/dbg.log 2>&1`;
-                #`logger -t xCAT "$msg"`;
-                #`zypper install -y xCAT-server xCAT-client perl-xCAT perl-DBD-mysql xCATsn vsftpd perl-IO-Socket-SSL`;
-                #`rpm -ivh /xcatpost/xcat/RPMS/*.rpm`;
-                #        }else {
-                #	&runcmd("rpm -ivh /xcatpost/xcat/RPMS/*/*.rpm");
-                #}
-                #}
 	&runcmd("/opt/xcat/sbin/copycerts");
 }