From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 15 Jul 2011 14:58:50 +0000 (+0000)
Subject: [backfire] backport r27616
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=e8d828b3ec98884c2eb808c7ece4d315caef673d

[backfire] backport r27616


git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@27617 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 88ae4ec3f..8ac4b72b1 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:=43.20
+PKG_RELEASE:=43.21
 
 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 e2e58456b..37b1e934e 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 a36885b87..d57a5b3c7 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 4504fa7a3..c4d24f119 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() {