From 108528b2ce6d962e422e1c81e4322eafcb7e4b73 Mon Sep 17 00:00:00 2001 From: jow Date: Fri, 15 Jul 2011 14:57:44 +0000 Subject: [package] base-files: use uci_toggle_state() to prevent unwanted aggregation of state vars (#9711) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27616 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/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 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'package/base-files/files') 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 a194ab8e2..03d7ca1f7 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() { -- cgit v1.2.3