don't emit ifup hotplug events on dhcp renew - use a new iface hotplug type 'update...

[openwrt.git] / package / base-files / files / usr / share / udhcpc / default.script

diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index 53c8faf..0eb044c 100755 (executable)
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -3,7 +3,7 @@
 . /etc/functions.sh
 include /lib/network
 
 . /etc/functions.sh
 include /lib/network
 

-RESOLV_CONF="/tmp/resolv.conf"
+RESOLV_CONF="/tmp/resolv.conf.auto"

 
 hotplug_event() {
        scan_interfaces
 
 hotplug_event() {
        scan_interfaces


@@ -13,8 +13,14 @@ hotplug_event() {
 
                config_get proto $ifc proto
                [ "$proto" = "dhcp" ] || continue
 
                config_get proto $ifc proto
                [ "$proto" = "dhcp" ] || continue

-
-               env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug iface
+               [ ifup = "$1" ] && {
+                       uci_set_state network "$ifc" ipaddr "$ip"
+                       uci_set_state network "$ifc" netmask "${subnet:-255.255.255.0}"
+                       uci_set_state network "$ifc" dnsdomain "$domain"
+                       uci_set_state network "$ifc" dns "$dns"
+                       uci_set_state network "$ifc" gateway "$router"
+               }
+               env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface

        done
 }
 
        done
 }
 


@@ -28,26 +34,33 @@ case "$1" in
                netmask ${subnet:-255.255.255.0} \
                broadcast ${broadcast:-+}
 
                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
-                                       
+               [ -n "$router" ] && {

                        for i in $router ; do
                                echo "adding router $i"
                                route add default gw $i dev $interface
                        for i in $router ; do
                                echo "adding router $i"
                                route add default gw $i dev $interface

+                               valid="$valid|$i"
+

                        done
                        done

-               fi
+
+                       echo "deleting old routes"
+                       $(route -n | awk '/^0.0.0.0\W{9}('$valid')\W/ {next} /^0.0.0.0/ {print "route del -net "$1" gw "$2";"}')
+               }

                
                [ -n "$dns" ] && {
                
                [ -n "$dns" ] && {

-                       echo -n > $RESOLV_CONF
-                       ${domain:+echo search $domain} >> $RESOLV_CONF
+                       echo -n > "${RESOLV_CONF}.tmp"
+                       ${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"

                        for i in $dns ; do
                                echo "adding dns $i"
                        for i in $dns ; do
                                echo "adding dns $i"

-                               echo "nameserver $i" >> $RESOLV_CONF
+                               echo "nameserver $i" >> "${RESOLV_CONF}.tmp"

                        done
                        done

+                       mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"

                }
                
                }
                

-               hotplug_event ifup
+               if [ "$1" = "renew" ]; then
+                       hotplug_event update
+               else
+                       hotplug_event ifup
+               fi

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