From d86b8b8413c9a8d0034b28f5ea4999f03570d82b Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 21 May 2013 18:15:42 +0000
Subject: [PATCH] remove version 2

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16383 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../share/xcat/install/scripts/post.xcat        | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/xCAT-server/share/xcat/install/scripts/post.xcat b/xCAT-server/share/xcat/install/scripts/post.xcat
index e6c8f8ad2..70292126a 100644
--- a/xCAT-server/share/xcat/install/scripts/post.xcat
+++ b/xCAT-server/share/xcat/install/scripts/post.xcat
@@ -23,7 +23,6 @@ do
 	GOTIT=0
 	for i in $MASTER_IPS
 	do
-      #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  -e robots=off -nH --cut-dirs=2 --reject "index.html*" --no-parent -t 0 -T 60 http://$i$INSTALLDIR/postscripts/ -P /xcatpost
 		if [ "$?" = "0" ]
 		then
@@ -32,7 +31,6 @@ do
          export NODE=#TABLE:nodelist:THISNODE:node#
          wget -N --waitretry=10 --random-wait -T 60 http://$i$TFTPDIR/mypostscripts/mypostscript.$NODE  -P /xcatpost 2> /tmp/wget.log
          mv /xcatpost/mypostscript.$NODE /xcatpost/mypostscript
-         #cp -f /xcatpost/mypostscript.$NODE /xcatpost/mypostscript
 
          if [ ! -x /usr/bin/openssl ]; then #Stop if no openssl to help the next bit
             exit 1
@@ -44,18 +42,12 @@ do
          mv $i/postscripts /xcatpost
          rm -rf $i
 
-         # If mypostscript doesn't exit, we will get it through getpostscript.awk
+         # If mypostscript doesn't exist, we will get it through getpostscript.awk
          if [ ! -x /xcatpost/mypostscript ]; then
 
          chmod +x /xcatpost/*
-         #/xcatpost/getpostscript.awk |sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' > /xcatpost/mypostscript
+         /xcatpost/getpostscript.awk |sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' > /xcatpost/mypostscript
          
-         /xcatpost/getpostscript.awk version2 > /dev/null
-         wget -N --waitretry=10 --random-wait -T 60 http://$i$TFTPDIR/mypostscripts/mypostscript.$NODE.tmp  -P /xcatpost 2>> /tmp/wget.log
-         rc=$?
-         if [ "$rc" = "0" ]; then
-              mv /xcatpost/mypostscript.$NODE.tmp /xcatpost/mypostscript
-         fi
 
          MYCONT=`grep MASTER /xcatpost/mypostscript`
          MAX_RETRIES=10
@@ -69,10 +61,7 @@ do
 
             let SLI=$RANDOM%10+10
             sleep $SLI
-            #/xcatpost/getpostscript.awk |sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' > /xcatpost/mypostscript
-            /xcatpost/getpostscript.awk version2 > /dev/null
-            wget -N --waitretry=10 --random-wait -T 60 http://$i$TFTPDIR/mypostscripts/mypostscript.$NODE.tmp  -P /xcatpost 2>> /tmp/wget.log
-            mv /xcatpost/mypostscript.$NODE.tmp /xcatpost/mypostscript
+            /xcatpost/getpostscript.awk |sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' > /xcatpost/mypostscript
 
             MYCONT=`grep MASTER /xcatpost/mypostscript`
          done