From 72a89f6d9e9b2bed9faa0f6560ddc11f551b86c4 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 4 Oct 2010 00:07:07 +0000
Subject: [package] 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.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23211 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/files/usr/share/udhcpc/default.script | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/base-files/files/usr/share/udhcpc/default.script')

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"
 	}
 
-- 
cgit v1.2.3