From e0e6d1029e7c3a27edaa5affedbcce7bbeb96abc Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 15 Jul 2011 14:57:44 +0000
Subject: [PATCH] base-files: use uci_toggle_state() to prevent unwanted
 aggregation of state vars (#9711)

SVN-Revision: 27616
---
 package/base-files/Makefile                            |  2 +-
 .../base-files/files/etc/hotplug.d/iface/00-netstate   |  6 +++---
 package/base-files/files/etc/hotplug.d/iface/10-routes |  2 +-
 package/base-files/files/lib/network/config.sh         | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 958f8ec1f2..75883d869c 100644
--- 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 e2e58456bd..37b1e934eb 100644
--- 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 a36885b871..d57a5b3c78 100644
--- 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 a194ab8e24..03d7ca1f7a 100755
--- 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() {
-- 
2.25.1