From c0b683d6a964e5436c32d6eb0fc187ae4c34d6c3 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 21 Sep 2009 14:12:48 +0000
Subject: [PATCH] -If getpostscript.awk fails, try multiple addresses in case
 the non-primary nic was mistakenly used

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4181 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/postscripts/xcatdsklspost | 54 +++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/xCAT/postscripts/xcatdsklspost b/xCAT/postscripts/xcatdsklspost
index e38e54c71..2bce30401 100755
--- a/xCAT/postscripts/xcatdsklspost
+++ b/xCAT/postscripts/xcatdsklspost
@@ -23,15 +23,12 @@ if [ -e '/etc/SuSE-release' ]; then
    OSVER=`grep -h VERSION /etc/SuSE-release |awk '{print $3}'`
 fi
 
-SIP=`grep -h dhcp-server-identifier /var/lib/dhclient/dhclient*.leases 2> /dev/null|tail -n 1|awk '{print $3}'|sed -e 's/;//'`
-if [ -z "$SIP" ]; then
-    SIP=`grep -h DHCPSID /var/lib/dhcpcd/*.info 2> /dev/null|awk -F= '{print $2}'|tail -n 1`
+SIPS=`grep -h dhcp-server-identifier /var/lib/dhclient/dhclient*.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
 
-#echo "SIP=$SIP"
-if [ "$OSVER" = "11" ]; then
-    SIP=`echo $SIP |awk -F\' '{print $2}'` #trim '   
-fi
+SIP=`echo $SIPS|tail -n 1` #Pick one for wget
 
 #open the xcatinfo file to look for the master if it is not set
 frominfofile=0
@@ -49,20 +46,6 @@ if [ -z $SIP ]; then
     exit  
 fi
 
-#save the SIP into the xcatinfo file
-if [ $frominfofile -eq 0 ]; then
-    if [ ! -f /opt/xcat/xcatinfo ]; then
-	mkdir -p /opt/xcat
-        touch /opt/xcat/xcatinfo
-    fi
-    grep 'XCATSERVER' /opt/xcat/xcatinfo 2>&1 > /dev/null
-    if [ $? -eq 0 ]; then
-	sed -i "s/XCATSERVER=.*/XCATSERVER=$SIP/" /opt/xcat/xcatinfo
-    else
-	echo "XCATSERVER=$SIP" >> /opt/xcat/xcatinfo
-    fi
-fi    
-
 if grep 'rw /rw tmpfs ' /proc/mounts  >& /dev/null; then
     touch /var/lock/subsys/xcatmounts
     echo '#!/bin/bash' > /etc/rc6.d/K10xcatmounts
@@ -113,11 +96,36 @@ while [ -z "$MYCONT" ]; do
     let SLI=$RANDOM%10
     let SLI=10+$SLI
     sleep $SLI
-    /xcatpost/getpostscript.awk | sed  -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' >  /tmp/mypostscript; 
-    MYCONT=`grep MASTER /tmp/mypostscript`
+    for SIP in $SIPS; do #Attempt against several candidates
+        if [ -x /usr/bin/openssl ]; then
+             XCATSERVER="$SIP:3001"
+             export XCATSERVER
+             USEOPENSSLFORXCAT=1 #Though this is the only method going forward, flag to allow backward compatibility with 2.2 generated netboot images
+             export USEOPENSSLFORXCAT
+        fi
+        /xcatpost/getpostscript.awk | sed  -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' >  /tmp/mypostscript; 
+        MYCONT=`grep MASTER /tmp/mypostscript`
+        if [ ! -z "$MYCONT" ]; then
+            break;
+        fi
+    done
 #    echo "MYCONT=$MYCONT"
 done
 
+#save the SIP into the xcatinfo file
+if [ $frominfofile -eq 0 ]; then
+    if [ ! -f /opt/xcat/xcatinfo ]; then
+	mkdir -p /opt/xcat
+        touch /opt/xcat/xcatinfo
+    fi
+    grep 'XCATSERVER' /opt/xcat/xcatinfo 2>&1 > /dev/null
+    if [ $? -eq 0 ]; then
+	sed -i "s/XCATSERVER=.*/XCATSERVER=$SIP/" /opt/xcat/xcatinfo
+    else
+	echo "XCATSERVER=$SIP" >> /opt/xcat/xcatinfo
+    fi
+fi    
+
 # when called by the updatenode command
 #modify the UPDATENODE flag to 1 
 if [ $# -gt 0 ]; then