From 28043c81c21caffcbe7d82ff7240dd197a879af0 Mon Sep 17 00:00:00 2001 From: lissav Date: Wed, 29 Sep 2010 13:43:06 +0000 Subject: [PATCH] do not substitute hostname if DB2, hostname not in the cfgloc file git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7720 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT/postscripts/xcatserver | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xCAT/postscripts/xcatserver b/xCAT/postscripts/xcatserver index 7216df16a..7222a9dd9 100755 --- a/xCAT/postscripts/xcatserver +++ b/xCAT/postscripts/xcatserver @@ -17,8 +17,12 @@ export USEOPENSSLFORXCAT getcredentials.awk xcat_server_cred | grep -v '<'|sed -e 's/<//' -e 's/&/&/' -e 's/"/"/' -e "s/'/'/" > /etc/xcat/cert/server-cred.pem chmod 600 /etc/xcat/cert/* getcredentials.awk xcat_cfgloc | grep -v '<'|sed -e 's/<//' -e 's/&/&/' -e 's/"/"/' -e "s/'/'/" > /etc/xcat/cfgloc - sed s/host=[^\|]*/host=$MASTER/ /etc/xcat/cfgloc > /etc/xcat/cfgloc.new - mv /etc/xcat/cfgloc.new /etc/xcat/cfgloc + # if not DB2 + grep "DB2" /etc/xcat/cfgloc 2>&1 1> /dev/null + if [ $? -eq 0 ]; then + sed s/host=[^\|]*/host=$MASTER/ /etc/xcat/cfgloc > /etc/xcat/cfgloc.new + mv /etc/xcat/cfgloc.new /etc/xcat/cfgloc + fi chmod 600 /etc/xcat/cfgloc # do not assume working directory, use the full path cp /xcatpost/_xcat/ca.pem /etc/xcat/cert/ca.pem