From 64b4e85ddc0b82ed77e17a7dfeabe9f393e67a10 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 22 Sep 2010 15:02:52 +0000 Subject: [PATCH] -Revert overly complicated dhcp dance, recommend makedns -d instead (failed too many times) git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7576 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-nbroot/overlay/etc/init.d/S10autodetect | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xCAT-nbroot/overlay/etc/init.d/S10autodetect b/xCAT-nbroot/overlay/etc/init.d/S10autodetect index 1fdc37a51..6fcdc791d 100755 --- a/xCAT-nbroot/overlay/etc/init.d/S10autodetect +++ b/xCAT-nbroot/overlay/etc/init.d/S10autodetect @@ -89,11 +89,9 @@ if [ $NEEDEHEA = 1 ]; then fi NICSTOWAIT=`/sbin/ifconfig -a|grep HWaddr|grep ^eth|sed -e 's/ .*//'` -#run udhcpc in two ways, to flush out leases with uid and leases without uid, and actually use the results of the more 'linux-like' lease, either way, on exit will release all to hold no leases for nic in $NICSTOWAIT; do - touch /tmp/ignorenic.$nic ifconfig $nic up - (udhcpc -i $nic -R;kill -USR2 `ps axf|grep -v grep|grep "udhcpc -i $nic -R"|awk '{print $1}'`;sleep 3;kill `ps axf|grep -v grep|grep "udhcpc -i $nic -R"|awk '{print $1}'`; rm /tmp/ignorenic.$nic; udhcpc -i $nic -R -C) & + udhcpc -i $nic -R & done @@ -103,7 +101,7 @@ until [ $extrat = 80 -o -z "$NICSTOWAIT" ]; do sleep 1 extrat=$(($extrat+1)) for nic in $NICSTOWAIT; do - if [ ! -f /tmp/ignorenic.$nic ] && ifconfig $nic|grep "inet addr"; then + if ifconfig $nic|grep "inet addr"; then NICSTOWAIT=`echo $NICSTOWAIT|sed -e s/$nic//` if [ $extrat -gt 45 ]; then echo "Warning: $nic took more than 45 seconds to receive DHCP reply, spanning-tree may not be configured well, examine switch configuration" >> /etc/motd