base-files: utilize uci_get_state to read the previous dhcp router address in udhcpc default script. The setup_switch() procedure provided by swconfig calls config_load() during network restart and thus confuses udhcpc's uci state keeping resulting in a missing default route on each second network restart. Bypass the cached state vars and query uci directly to make the script immune against unwanted runtime changes.
SVN-Revision: 23211
This commit is contained in:
parent
7eb2c8959c
commit
0fda5f7507
2 changed files with 3 additions and 3 deletions
|
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||||
include $(INCLUDE_DIR)/kernel.mk
|
include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
PKG_NAME:=base-files
|
PKG_NAME:=base-files
|
||||||
PKG_RELEASE:=56
|
PKG_RELEASE:=57
|
||||||
|
|
||||||
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
|
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
|
||||||
PKG_BUILD_DEPENDS:=opkg/host
|
PKG_BUILD_DEPENDS:=opkg/host
|
||||||
|
|
|
@ -41,8 +41,8 @@ setup_interface () {
|
||||||
# Default Route
|
# Default Route
|
||||||
[ -n "$ifc" ] && {
|
[ -n "$ifc" ] && {
|
||||||
change_state network "$ifc" lease_gateway "$router"
|
change_state network "$ifc" lease_gateway "$router"
|
||||||
config_get old_router "$ifc" gateway
|
old_router="$(uci_get_state network "$ifc" gateway)"
|
||||||
user_router=$(uci_get "network.$ifc.gateway")
|
user_router="$(uci_get network "$ifc" gateway)"
|
||||||
[ -n "$user_router" ] && router="$user_router"
|
[ -n "$user_router" ] && router="$user_router"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue