update wpa_supplicant to v0.4.9,

[openwrt.git] / openwrt / package / base-files / default / 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 0c08985..4604648 100755 (executable)
--- a/openwrt/package/base-files/default/usr/share/udhcpc/default.script
+++ b/openwrt/package/base-files/default/usr/share/udhcpc/default.script
@@ -1,42 +1,51 @@
 #!/bin/sh
 #!/bin/sh

-# udhcpc script edited by Tim Riker <Tim@Rikers.org>
-# (slightly modified for OpenWrt)
-

 [ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
 [ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1

+. /etc/config/network

 
 RESOLV_CONF="/tmp/resolv.conf"
 
 
 RESOLV_CONF="/tmp/resolv.conf"
 

-case "$1" in
-        deconfig)
-                ifconfig $interface 0.0.0.0
-                ;;
-
-        renew|bound)
-                ifconfig $interface $ip \
-                netmask ${subnet:-255.255.255.0} \
-                broadcast ${broadcast:-+}
-
-                if [ -n "$router" ] ; then
-                        echo "deleting routers"
-                        while route del default gw 0.0.0.0 dev $interface ; do
-                                :
-                        done
-
-                        for i in $router ; do
-                                route add default gw $i dev $interface
-                        done
-                fi
-
-                echo -n > $RESOLV_CONF
-                ${domain:+echo search $domain} >> $RESOLV_CONF
-                for i in $dns ; do
-                        echo adding dns $i
-                        echo nameserver $i >> $RESOLV_CONF
+hotplug_event() {
+       for ifname in lan wan wifi ${ifnames}; do
+               eval "proto=\"\${${ifname}_proto}\""
+               eval "if=\"\${${ifname}_ifname}\""
+               [ "$proto" = "dhcp" ] || continue
+               [ "$if" = "$interface" ] || continue
+               env -i ACTION="$1" INTERFACE="$ifname" PROTO=dhcp /sbin/hotplug iface
+       done
+}

 
 

+case "$1" in
+       deconfig)
+               ifconfig $interface 0.0.0.0
+               hotplug_event ifdown
+       ;;
+       renew|bound)
+               ifconfig $interface $ip \
+               netmask ${subnet:-255.255.255.0} \
+               broadcast ${broadcast:-+}
+
+               if [ -n "$router" ] ; then
+                       echo "deleting routers"
+                       while route del default gw 0.0.0.0 dev $interface >&- 2>&- ; do :; done
+                                       
+                       for i in $router ; do
+                               echo "adding router $i"
+                               route add default gw $i dev $interface
+                       done
+               fi
+
+               echo -n > $RESOLV_CONF
+               ${domain:+echo search $domain} >> $RESOLV_CONF
+               for i in $dns ; do
+                       echo "adding dns $i"
+                       echo "nameserver $i" >> $RESOLV_CONF
+               done
+               
+               hotplug_event ifup
+               

                # user rules
                [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
                # user rules
                [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user

-
-                done
-                ;;
+       ;;

 esac
 esac

+

 exit 0
 exit 0