fix a few issues with dynamically assigned interfaces

[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..30e84e6 100755 (executable)
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -3,18 +3,25 @@
 . /etc/functions.sh
 include /lib/network
 
-RESOLV_CONF="/tmp/resolv.conf"
+RESOLV_CONF="/tmp/resolv.conf.auto"
 
 hotplug_event() {
        scan_interfaces
+       config_load /var/state/network
        for ifc in $interfaces; do
                config_get ifname $ifc ifname
                [ "$ifname" = "$interface" ] || 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 "/var/state/network.$ifc.ipaddr=$ip"
+                       uci set "/var/state/network.$ifc.netmask=${subnet:-255.255.255.0}"
+                       uci set "/var/state/network.$ifc.dnsdomain=$domain"
+                       uci set "/var/state/network.$ifc.dns=$dns"
+                       uci set "/var/state/network.$ifc.gateway=$router"
+               }
+               env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
        done
 }
 
@@ -28,23 +35,26 @@ case "$1" in
                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
+                               valid="$valid|$i"
+
                        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" ] && {
-                       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"
-                               echo "nameserver $i" >> $RESOLV_CONF
+                               echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
                        done
+                       mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
                }
                
                hotplug_event ifup