[package] base-files: use uci_toggle_state() to prevent unwanted aggregation of state...
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 15 Jul 2011 14:57:44 +0000 (14:57 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 15 Jul 2011 14:57:44 +0000 (14:57 +0000)
SVN-Revision: 27616

package/base-files/Makefile
package/base-files/files/etc/hotplug.d/iface/00-netstate
package/base-files/files/etc/hotplug.d/iface/10-routes
package/base-files/files/lib/network/config.sh

index 958f8ec..75883d8 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=73
+PKG_RELEASE:=74
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
index e2e5845..37b1e93 100644 (file)
@@ -1,5 +1,5 @@
 [ ifup = "$ACTION" ] && {
-       uci_set_state network "$INTERFACE" up 1 
-       uci_set_state network "$INTERFACE" connect_time $(sed -ne 's![^0-9].*$!!p' /proc/uptime)
-       [ -n "$DEVICE" ] && uci_set_state network "$INTERFACE" ifname "$DEVICE"
+       uci_toggle_state network "$INTERFACE" up 1 
+       uci_toggle_state network "$INTERFACE" connect_time $(sed -ne 's![^0-9].*$!!p' /proc/uptime)
+       [ -n "$DEVICE" ] && uci_toggle_state network "$INTERFACE" ifname "$DEVICE"
 }
index a36885b..d57a5b3 100644 (file)
@@ -84,7 +84,7 @@ case "$ACTION" in
                # Save alias references in state vars
                local aliases
                config_get aliases "$INTERFACE" aliases
-               [ -z "$aliases" ] || uci_set_state network "$INTERFACE" aliases "$aliases"
+               [ -z "$aliases" ] || uci_toggle_state network "$INTERFACE" aliases "$aliases"
 
                # Make ip6addr of parent iface the main address again
                local ip6addr
index a194ab8..03d7ca1 100755 (executable)
@@ -96,8 +96,8 @@ add_dns() {
        done
 
        [ -n "$cfg" ] && {
-               uci_set_state network "$cfg" dns "$add"
-               uci_set_state network "$cfg" resolv_dns "$add"
+               uci_toggle_state network "$cfg" dns "$add"
+               uci_toggle_state network "$cfg" resolv_dns "$add"
        }
 }
 
@@ -176,7 +176,7 @@ prepare_interface() {
                                        for dev in $(sort_list "$devices" "$iface"); do
                                                append newdevs "$dev"
                                        done
-                                       uci_set_state network "$config" device "$newdevs"
+                                       uci_toggle_state network "$config" device "$newdevs"
                                        $DEBUG ifconfig "$iface" 0.0.0.0
                                        $DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1
                                        $DEBUG brctl addif "br-$config" "$iface"
@@ -210,8 +210,8 @@ set_interface_ifname() {
 
        local device
        config_get device "$1" device
-       uci_set_state network "$config" ifname "$ifname"
-       uci_set_state network "$config" device "$device"
+       uci_toggle_state network "$config" ifname "$ifname"
+       uci_toggle_state network "$config" device "$device"
 }
 
 setup_interface_none() {