Author: titmuss
Date: Thu Feb 14 15:01:28 2008
New Revision: 1963
URL: http://svn.slimdevices.com?rev=1963&root=Jive&view=rev
Log:
Bug: 7129
Description:
Make sure the dhcp client is stopped before calling ifconfig. Dhcp was
sometimes
bringing the interface back up, and this prevented the wlan modules from being
removed.
Modified:
branches/7.0/squeezeboxJive/src/system/filesystem/etc/init.d/wlan
Modified: branches/7.0/squeezeboxJive/src/system/filesystem/etc/init.d/wlan
URL:
http://svn.slimdevices.com/branches/7.0/squeezeboxJive/src/system/filesystem/etc/init.d/wlan?rev=1963&root=Jive&r1=1962&r2=1963&view=diff
==============================================================================
--- branches/7.0/squeezeboxJive/src/system/filesystem/etc/init.d/wlan (original)
+++ branches/7.0/squeezeboxJive/src/system/filesystem/etc/init.d/wlan Thu Feb
14 15:01:28 2008
@@ -47,16 +47,25 @@
# Stop wpa supplicant
killall wpa_cli
killall wpa_supplicant
-
- # Down the interface
- ifconfig eth0 down
- /bin/rm -rf /var/run/ifstate
-
+
# Make sure udhcpc is killed
if [ -r /var/run/udhcpc.eth0.pid ]
then
- kill -TERM `cat /var/run/udhcpc.eth0.pid`
+ PID=`cat /var/run/udhcpc.eth0.pid`
+ kill -TERM $PID
+
+ # Wait until udhcpc is dead
+ kill -0 $PID >/dev/null 2>&1
+ while [ $? == 0 ]; do
+ sleep 1
+ kill -0 $PID >/dev/null 2>&1
+ done
fi
+
+ echo "Taking down eth0..."
+ ifconfig eth0 down
+
+ /bin/rm -rf /var/run/ifstate
# Remove wlan drivers
rmmod gspi8xxx gspi
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
