From 2d4141b7d7ea61e2bdd7006ab4bf59925abc340e Mon Sep 17 00:00:00 2001 From: yangsbj Date: Tue, 6 Nov 2018 01:36:29 -0500 Subject: [PATCH] modify HTTPPORT in post.xcat with macro TABLEBLANKOKAY --- xCAT-server/share/xcat/install/scripts/post.debian | 2 +- xCAT-server/share/xcat/install/scripts/post.xcat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/share/xcat/install/scripts/post.debian b/xCAT-server/share/xcat/install/scripts/post.debian index b533faeb7..40d26c8f0 100644 --- a/xCAT-server/share/xcat/install/scripts/post.debian +++ b/xCAT-server/share/xcat/install/scripts/post.debian @@ -34,7 +34,7 @@ export MASTER_IP="#XCATVAR:XCATMASTER#" export MASTER_IPS="#XCATVAR:XCATMASTER#" export MASTER="#XCATVAR:XCATMASTER#" export INSTALLDIR=#TABLE:site:key=installdir:value# -export HTTPPORT=#TABLE:site:key=httpport:value# +export HTTPPORT=#TABLEBLANKOKAY:site:key=httpport:value# if [ -z "$INSTALLDIR" ]; then INSTALLDIR="/install" fi diff --git a/xCAT-server/share/xcat/install/scripts/post.xcat b/xCAT-server/share/xcat/install/scripts/post.xcat index fc614b805..6cf90fb96 100755 --- a/xCAT-server/share/xcat/install/scripts/post.xcat +++ b/xCAT-server/share/xcat/install/scripts/post.xcat @@ -8,7 +8,7 @@ export XCATIPORT=#TABLE:site:key=xcatiport:value# export INSTALLDIR=#TABLE:site:key=installdir:value# export TFTPDIR=#TABLE:site:key=tftpdir:value# export XCATDEBUGMODE="#TABLEBLANKOKAY:site:key=xcatdebugmode:value#" -export HTTPPORT="#TABLE:site:key=httpport:value#" +export HTTPPORT="#TABLEBLANKOKAY:site:key=httpport:value#" #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/scriptlib#