make network config script work with brctl from both bridge-utils & busybox

[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 30e84e6..0eb044c 100755 (executable)
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -7,7 +7,6 @@ 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
@@ -15,11 +14,11 @@ hotplug_event() {
                config_get proto $ifc proto
                [ "$proto" = "dhcp" ] || continue
                [ 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"
+                       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
@@ -57,7 +56,11 @@ case "$1" in
                        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