xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

refine the PR

Browse Source
This commit is contained in:
yangsbj 2018-11-05 03:15:37 -05:00
parent 1eae3b5b28
commit dc8c863283
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xCAT/postscripts/xcatdsklspost
View File

@ -226,11 +226,11 @@ parsehttpserver ()
fi
if [ "$option" = "server" ];then
return $server
echo "$server"
fi
if [ "$option" = "port" ];then
return $port
echo "$port"
fi
}
@ -251,13 +251,13 @@ else
if [ $ARGNUM -gt 1 ]; then
if [ $2 = "-m" ]; then
P_SVR=$3
P_SIP=parsehttpserver "$P_SVR" 'server'
HTTPPORT=parsehttpserver "$P_SVR" 'port'
P_SIP=$(parsehttpserver "$P_SVR" 'server')
HTTPPORT=$(parsehttpserver "$P_SVR" 'port')
else
if [ $2 = "-M" ]; then
P_SVR=$3
P_SIP=parsehttpserver "$P_SVR" 'server'
HTTPPORT=parsehttpserver "$P_SVR" 'port'
P_SIP=$(parsehttpserver "$P_SVR" 'server')
HTTPPORT=$(parsehttpserver "$P_SVR" 'port')
new_ms=$P_SIP # -M means we will update xcatinfo file XCATSERVER
fi
fi
@ -434,8 +434,9 @@ else # for common mode MODE=1,2,3,5 (updatenode,moncfg,node deployment)
# also update the XCATSERVER in the /etc/xcat/xcatinfo file with this
# address
if [ -n "$P_SIP" ]; then # passed in with updatenode on -M/-m
SIP="${P_SIP}:${HTTPPORT}"
download_postscripts $SIP
#SIP="${P_SIP}:${HTTPPORT}"
SIP=${P_SIP}
download_postscripts ${P_SIP}:${HTTPPORT}
if [ $? -eq 0 ]; then
downloaded=1
fi