[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 6c57afda169c201df58c41528d8af839ff8e62ea..ab60557f5e90f28bf19eb90b5d49669f0a81672b 100644 (file)
--- 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 92e3474bddc7878b1935e4a3cba45d62e85593da..708f847839f79985c283eae2ce8a771a37e53f96 100755 (executable)
--- 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"
        }