From 926c88c43e87cc3c124956421957fcce2e97e3ec Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Fri, 16 Mar 2012 10:17:17 +0000 Subject: [PATCH] fixed a problem in power 775 that compute node cannot get its xcatserver ip from dhcp server over hfi, which was introduced by revision 10534. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@11880 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT/postscripts/xcatdsklspost | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xCAT/postscripts/xcatdsklspost b/xCAT/postscripts/xcatdsklspost index e48feabba..c3bf44515 100755 --- a/xCAT/postscripts/xcatdsklspost +++ b/xCAT/postscripts/xcatdsklspost @@ -170,7 +170,10 @@ else # for common mode fi SIPS=`grep -h dhcp-server-identifier /var/lib/dhclient/dhclient*eth*.leases 2> /dev/null|awk '{print $3}'|sed -e 's/;//'` if [ -z "$SIPS" ]; then - SIPS=`grep -h DHCPSID /var/lib/dhcpcd/*.info 2> /dev/null|awk -F= '{print $2}'|sed -e s/\'//g` + SIPS=`grep -h dhcp-server-identifier /var/lib/dhclient/dhclient*hf*.leases 2> /dev/null|awk '{print $3}'|sed -e 's/;//'` + if [ -z "$SIPS" ]; then + SIPS=`grep -h DHCPSID /var/lib/dhcpcd/*.info 2> /dev/null|awk -F= '{print $2}'|sed -e s/\'//g` + fi fi SIP=`echo $SIPS|awk '{printf $NF}' | tail -n 1` #Pick one for wget if [ -n "$SIP" ]; then