From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 4 Oct 2010 00:07:07 +0000 (+0000)
Subject: base-files: utilize uci_get_state to read the previous dhcp router address in udhcpc... 
X-Git-Tag: reboot~18803
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=0fda5f750739ac512b6522575ab3fd6b257af387;p=openwrt%2Fopenwrt.git

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
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index b8ff8dd371..1f510df096 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:=56
+PKG_RELEASE:=57
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index 92e3474bdd..708f847839 100755
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -41,8 +41,8 @@ setup_interface () {
 	# Default Route
 	[ -n "$ifc" ] && {
 		change_state network "$ifc" lease_gateway "$router"
-		config_get old_router "$ifc" gateway
-		user_router=$(uci_get "network.$ifc.gateway")
+		old_router="$(uci_get_state network "$ifc" gateway)"
+		user_router="$(uci_get network "$ifc" gateway)"
 		[ -n "$user_router" ] && router="$user_router"
 	}