From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 4 Oct 2010 00:08:54 +0000 (+0000)
Subject: [backfire] merge r23211
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=fe1eb771965c427c9736a08dc0d37d74f414126e;p=10.03%2Fopenwrt.git

[backfire] merge r23211


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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 6c57afda1..ab60557f5 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.4
+PKG_RELEASE:=43.5
 
 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 92e3474bd..708f84783 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"
 	}