fix error messages

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2996 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index dd4ee88..4579a84 100644 (file)
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/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 &"
                        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"
                        ${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
                ;;
                *)
                        # hotplug events are handled by /usr/share/udhcpc/default.script
                ;;
                *)

diff --git a/package/base-files/default/usr/share/udhcpc/default.script b/package/base-files/default/usr/share/udhcpc/default.script
index cef2c2e..42d3eaf 100755 (executable)
--- a/package/base-files/default/usr/share/udhcpc/default.script
+++ b/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
                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
                                for i in $router ; do
                                        route add default gw $i dev $interface
                                done