From: Mike Baker <mbm@openwrt.org>
Date: Mon, 16 Jan 2006 19:16:20 +0000 (+0000)
Subject: fix error messages
X-Git-Tag: reboot~31237
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=1f59f207c49b08af21e65a8c58e58fd37c9093b4

fix error messages

SVN-Revision: 2996
---

diff --git a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net b/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
index dd4ee8863a..4579a84704 100644
--- a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
@@ -75,12 +75,7 @@ do_ifup() {
 			DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*}
 			[ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME"
 			[ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &"
-			oldpid=$(cat $pidfile)
 			${DEBUG:-eval} "udhcpc $DHCP_ARGS"
-			pidof udhcpc | grep "$oldpid" >&- 2>&- && {
-				sleep 1
-				kill -9 $oldpid
-			}
 			# hotplug events are handled by /usr/share/udhcpc/default.script
 		;;
 		*)
diff --git a/openwrt/package/base-files/default/usr/share/udhcpc/default.script b/openwrt/package/base-files/default/usr/share/udhcpc/default.script
index cef2c2ed25..42d3eaf0c2 100755
--- a/openwrt/package/base-files/default/usr/share/udhcpc/default.script
+++ b/openwrt/package/base-files/default/usr/share/udhcpc/default.script
@@ -28,8 +28,9 @@ case "$1" in
 		if [ -n "$router" ] ; then
 
 			if [ "$router" != "$(route -n | grep '^0.0.0.0' | grep $interface | awk '{ print $2 }')" ] ; then
-				echo "deleting routers"
-				while route del default gw 0.0.0.0 dev $interface ; do :; done				
+				while route del default gw 0.0.0.0 dev $interface 2>&- ; do
+					echo "removing old default route"
+				done				
 				for i in $router ; do
 					route add default gw $i dev $interface
 				done