From a1edd1ece5934bcfba73fced0f68f2c23d83d0d4 Mon Sep 17 00:00:00 2001 From: jjhua Date: Mon, 15 Oct 2012 07:36:06 +0000 Subject: [PATCH] performance enhancement, site.precreatemypostscripts=1 support for linux diskfull installation git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14009 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- .../share/xcat/install/scripts/post.xcat | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/xCAT-server/share/xcat/install/scripts/post.xcat b/xCAT-server/share/xcat/install/scripts/post.xcat index f90ae9442..fdce3991a 100644 --- a/xCAT-server/share/xcat/install/scripts/post.xcat +++ b/xCAT-server/share/xcat/install/scripts/post.xcat @@ -6,9 +6,15 @@ export MASTER_IPS="#XCATVAR:XCATMASTER#" export MASTER="#XCATVAR:XCATMASTER#" export NODESTATUS="#XCATVAR:NODESTATUS#" export INSTALLDIR=#TABLE:site:key=installdir:value# +export TFTPDIR=#TABLE:site:key=tftpdir:value# if [ -z "$INSTALLDIR" ]; then INSTALLDIR="/install" fi +if [ -z "$TFTPDIR" ]; then + + TFTPDIR="/tftpboot" +fi + cd /tmp RAND=$(perl -e 'print int(rand(50)). "\n"') sleep $RAND @@ -21,6 +27,13 @@ do 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 + + rm -rf /xcatpost/mypostscript + 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 fi @@ -30,6 +43,10 @@ do export XCATSERVER mv $i/postscripts /xcatpost rm -rf $i + + # If mypostscript doesn't exit, 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 MYCONT=`grep MASTER /xcatpost/mypostscript` @@ -48,6 +65,7 @@ do MYCONT=`grep MASTER /xcatpost/mypostscript` done + fi chmod +x /xcatpost/mypostscript GOTIT=1