From ab2ce81e32b117ef3943df07292a47e2a2ddffd7 Mon Sep 17 00:00:00 2001 From: ligc Date: Fri, 11 Nov 2011 05:59:28 +0000 Subject: [PATCH] ftp dependency removal - fix for post.sles and post.sles11 git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10990 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/install/scripts/post.sles | 5 +++++ xCAT-server/share/xcat/install/scripts/post.sles11 | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/xCAT-server/share/xcat/install/scripts/post.sles b/xCAT-server/share/xcat/install/scripts/post.sles index fda3b521f..5fdd47236 100644 --- a/xCAT-server/share/xcat/install/scripts/post.sles +++ b/xCAT-server/share/xcat/install/scripts/post.sles @@ -72,6 +72,10 @@ echo $HOSTNAME export MASTER_IP=#XCATVAR:XCATMASTER# export MASTER_IPS=#XCATVAR:XCATMASTER# export MASTER="#XCATVAR:XCATMASTER#" +export INSTALLDIR=#TABLE:site:key=installdir:value# +if [ -z "$INSTALLDIR" ]; then + INSTALLDIR="/install" +fi # # This script has not yet been updated to work with service nodes @@ -130,6 +134,7 @@ do RAND=$(perl -e 'print int(rand(5)). "\n"') sleep $RAND done +echo "INSTALLDIR=$INSTALLDIR" >> /opt/xcat/xcatinfo PATH=/xcatpost:$PATH export PATH diff --git a/xCAT-server/share/xcat/install/scripts/post.sles11 b/xCAT-server/share/xcat/install/scripts/post.sles11 index c1e22aaa1..c7b2bbb94 100644 --- a/xCAT-server/share/xcat/install/scripts/post.sles11 +++ b/xCAT-server/share/xcat/install/scripts/post.sles11 @@ -54,6 +54,10 @@ echo $HOSTNAME export MASTER_IP=#XCATVAR:XCATMASTER# export MASTER_IPS=#XCATVAR:XCATMASTER# export MASTER="#XCATVAR:XCATMASTER#" +export INSTALLDIR=#TABLE:site:key=installdir:value# +if [ -z "$INSTALLDIR" ]; then + INSTALLDIR="/install" +fi # # This script has not yet been updated to work with service nodes @@ -113,6 +117,7 @@ do RAND=$(perl -e 'print int(rand(5)). "\n"') sleep $RAND done +echo "INSTALLDIR=$INSTALLDIR" >> /opt/xcat/xcatinfo PATH=/xcatpost:$PATH export PATH