From 2168497930dc3fdd94ddef27c0cbf929a9aa856d Mon Sep 17 00:00:00 2001 From: ligc Date: Fri, 2 Dec 2011 07:10:56 +0000 Subject: [PATCH] export INSTALL for wget with http git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11115 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/install/scripts/post.sles11.iscsi | 4 ++++ xCAT-server/share/xcat/install/scripts/post.sles11.raid1 | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/xCAT-server/share/xcat/install/scripts/post.sles11.iscsi b/xCAT-server/share/xcat/install/scripts/post.sles11.iscsi index 473c37bcc..0782a0105 100644 --- a/xCAT-server/share/xcat/install/scripts/post.sles11.iscsi +++ b/xCAT-server/share/xcat/install/scripts/post.sles11.iscsi @@ -28,6 +28,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 # for servicenode, add /install to /etc/fstab echo "$MASTER:/install /install nfs timeo=14,intr 1 2" >>/etc/fstab diff --git a/xCAT-server/share/xcat/install/scripts/post.sles11.raid1 b/xCAT-server/share/xcat/install/scripts/post.sles11.raid1 index 7988d0082..d8ef5ecc6 100644 --- a/xCAT-server/share/xcat/install/scripts/post.sles11.raid1 +++ b/xCAT-server/share/xcat/install/scripts/post.sles11.raid1 @@ -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