mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

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

Browse Source 
SVN-Revision: 27616
This commit is contained in:
Jo-Philipp Wich 2011-07-15 14:57:44 +00:00
parent 9ee12e3f62
commit e0e6d1029e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/Makefile
View 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

6
package/base-files/files/etc/hotplug.d/iface/00-netstate
View 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"
}

2
package/base-files/files/etc/hotplug.d/iface/10-routes
View 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

10
package/base-files/files/lib/network/config.sh
View File

@ -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() {