base-files: use uci_toggle_state() to prevent unwanted aggregation of state vars...

SVN-Revision: 27616

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 958f8ec1f232948e00f202d1b9c7f18ad91df436..75883d869cef1d3cdb90dbfe06e531b54aaee139 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -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

diff --git a/package/base-files/files/etc/hotplug.d/iface/00-netstate b/package/base-files/files/etc/hotplug.d/iface/00-netstate
index e2e58456bd81a8d7b8b5300f2f9bdb4082ef57f4..37b1e934eba0b89f2f07e96b64608cf836fd833b 100644 (file)
--- a/package/base-files/files/etc/hotplug.d/iface/00-netstate
+++ b/package/base-files/files/etc/hotplug.d/iface/00-netstate
@@ -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"
 }

diff --git a/package/base-files/files/etc/hotplug.d/iface/10-routes b/package/base-files/files/etc/hotplug.d/iface/10-routes
index a36885b871f93ff4cd035a74dde4ad887eda589c..d57a5b3c780a93a7e25434daba64d41b2b1039fe 100644 (file)
--- a/package/base-files/files/etc/hotplug.d/iface/10-routes
+++ b/package/base-files/files/etc/hotplug.d/iface/10-routes
@@ -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

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index a194ab8e24dc53d3b1752c6cadde9aaaefcdbae9..03d7ca1f7a523925a59039268176533e23d51b0d 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -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() {