Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core

This commit is contained in:
Victor Hu 2015-03-25 13:36:40 -04:00
commit 419af5ce88

View File

@ -12,11 +12,12 @@ fi
SLI=$(awk 'BEGIN{srand(); printf("%d\n",rand()*10)}')
sleep $SLI
MACADDR=`grep MACADDRESS= /xcatpost/mypostscript.post |awk -F = '{print $2}'|sed s/\'//g`
INSTALLNIC=`ip -o link|grep -i $MACADDR|awk '{print $2}'|sed s/://`
#the nics have not been configured when running the PBS sometimes, need to make sure...
RETRY=0
until ip -4 --oneline addr show|grep -v 127.0.0.1 >/dev/null
until ip -4 --oneline addr show dev $INSTALLNIC|grep inet >/dev/null
do
sleep 2
RETRY=$[ $RETRY + 1 ]