From 379999e08edec050e92d3b57e27913a4aa018a3f Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Tue, 22 Jun 2010 18:15:42 +0000 Subject: [PATCH] -Try to increase reliability of DHCPRELEASE attempts git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6578 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-nbroot/overlay/bin/rebootnode | 1 + xCAT-nbroot/overlay/etc/init.d/S10autodetect | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xCAT-nbroot/overlay/bin/rebootnode b/xCAT-nbroot/overlay/bin/rebootnode index 327f4d050..92f5f5ec6 100755 --- a/xCAT-nbroot/overlay/bin/rebootnode +++ b/xCAT-nbroot/overlay/bin/rebootnode @@ -1,5 +1,6 @@ for udhcpc in `ps axf|grep -i udhcpc|grep -v grep|awk '{print $1}'`; do kill -USR2 $udhcpc done +sleep 5 reboot -f diff --git a/xCAT-nbroot/overlay/etc/init.d/S10autodetect b/xCAT-nbroot/overlay/etc/init.d/S10autodetect index 54cafb1a9..ffd4075a4 100755 --- a/xCAT-nbroot/overlay/etc/init.d/S10autodetect +++ b/xCAT-nbroot/overlay/etc/init.d/S10autodetect @@ -93,7 +93,7 @@ NICSTOWAIT=`/sbin/ifconfig -a|grep HWaddr|grep ^eth|sed -e 's/ .*//'` for nic in $NICSTOWAIT; do touch /tmp/ignorenic.$nic ifconfig $nic up - (udhcpc -i $nic -R;kill `ps axf|grep "udhcpc -i $nic -R"|awk '{print $1}'`; sleep 1; rm /tmp/ignorenic.$nic; udhcpc -i $nic -R -C) & + (udhcpc -i $nic -R;kill -USR2 `ps axf|grep -v grep|grep "udhcpc -i $nic -R"|awk '{print $1}'`;kill `ps axf|grep -v grep|grep "udhcpc -i $nic -R"|awk '{print $1}'`; rm /tmp/ignorenic.$nic; udhcpc -i $nic -R -C) & done