Changeset 2996

Timestamp:

2006-01-16T20:16:20+01:00 (12 years ago)

Author:

mbm

Message:

fix error messages

Location:

trunk/openwrt/package/base-files/default

Files:

• etc/hotplug.d/net/10-net (modified) (1 diff)
• usr/share/udhcpc/default.script (modified) (1 diff)

trunk/openwrt/package/base-files/default/etc/hotplug.d/net/10-net

@@ -76 +76 @@
                         [ -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
                 ;;

trunk/openwrt/package/base-files/default/usr/share/udhcpc/default.script

@@ -29 +29 @@
 
                         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