aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-10-04 00:07:07 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-10-04 00:07:07 +0000
commit54a02791d0c5cd71f373a3dc77e30ba6287c9191 (patch)
treea31c040c682abac8c4fa725e3fa27e12c5601380 /package/base-files/files
parent90549d3d32e9e493154766425c0b3fb94d2d6bcf (diff)
downloadupstream-54a02791d0c5cd71f373a3dc77e30ba6287c9191.tar.gz
upstream-54a02791d0c5cd71f373a3dc77e30ba6287c9191.tar.bz2
upstream-54a02791d0c5cd71f373a3dc77e30ba6287c9191.zip
[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
Diffstat (limited to 'package/base-files/files')
-rwxr-xr-xpackage/base-files/files/usr/share/udhcpc/default.script4
1 files changed, 2 insertions, 2 deletions
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"
}