From 22f9c58bd773bef1be0fb651265f2f004581dd99 Mon Sep 17 00:00:00 2001
From: mxi1 <mxi1@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 9 Apr 2009 08:33:16 +0000
Subject: [PATCH] -according Jarrod's code change (from stunnel to openssl),
 post.sles11 is updated;and move service.sles11.ppc64.tmpl to
 service.sles11.tmpl;and remove <pattern>base-64bit</pattern> from the .tmpl
 file;

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3145 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/share/xcat/install/scripts/post.sles11       | 9 ++-------
 .../{service.sles11.ppc64.tmpl => service.sles11.tmpl}   | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)
 rename xCAT-server/share/xcat/install/sles/{service.sles11.ppc64.tmpl => service.sles11.tmpl} (98%)

diff --git a/xCAT-server/share/xcat/install/scripts/post.sles11 b/xCAT-server/share/xcat/install/scripts/post.sles11
index d524f358e..f8daa837a 100644
--- a/xCAT-server/share/xcat/install/scripts/post.sles11
+++ b/xCAT-server/share/xcat/install/scripts/post.sles11
@@ -55,12 +55,6 @@ export MASTER_IP=#XCATVAR:XCATMASTER#
 export MASTER_IPS=#XCATVAR:XCATMASTER#
 export MASTER="#XCATVAR:XCATMASTER#"
 
-# for servicenode, add /install to /etc/fstab
-echo "$MASTER:/install  /install    nfs timeo=14,intr   1 2" >>/etc/fstab
-
-# check the arch for nodetype
-NODE_ARCH=#TABLE:nodetype:$NODE:arch#
-
 #
 #  This script has not yet been updated to work with service nodes
 #
@@ -71,7 +65,6 @@ do
 	do
 		#mount -r $i:/install/postscripts /xcatpost
       wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused  -t 0 -T 60 ftp://$i/postscripts
-      wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused  -t 0 -T 60 ftp://$i/post/otherpkgs/sles11/$NODE_ARCH
 
 		if [ "$?" = "0" ]
 		then
@@ -81,6 +74,8 @@ do
                 XCATSERVER=$i:3001
                 export XCATSERVER
             else
+                 NODE_ARCH=#TABLE:nodetype:$NODE:arch#
+                 wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused  -t 0 -T 60 ftp://$i/post/otherpkgs/sles11/$NODE_ARCH
                  rpm -ivh $i/post/otherpkgs/sles11/$NODE_ARCH/stunnel*.rpm
                  mkdir -p /usr/var/run/stunnel
                      mkdir -p /var/stunnel
diff --git a/xCAT-server/share/xcat/install/sles/service.sles11.ppc64.tmpl b/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
similarity index 98%
rename from xCAT-server/share/xcat/install/sles/service.sles11.ppc64.tmpl
rename to xCAT-server/share/xcat/install/sles/service.sles11.tmpl
index a17bd7738..7c6d5412e 100644
--- a/xCAT-server/share/xcat/install/sles/service.sles11.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
@@ -38,7 +38,6 @@
     </partitioning>
     <software>
       <patterns config:type="list">
-        <pattern>base-64bit</pattern>
         <pattern>base</pattern>
 	    <pattern>x11</pattern>
       </patterns>