diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-10-04 00:07:07 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-10-04 00:07:07 +0000 |
| commit | 54a02791d0c5cd71f373a3dc77e30ba6287c9191 (patch) | |
| tree | a31c040c682abac8c4fa725e3fa27e12c5601380 /package/base-files | |
| parent | 90549d3d32e9e493154766425c0b3fb94d2d6bcf (diff) | |
| download | master-187ad058-54a02791d0c5cd71f373a3dc77e30ba6287c9191.tar.gz master-187ad058-54a02791d0c5cd71f373a3dc77e30ba6287c9191.tar.bz2 master-187ad058-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')
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/usr/share/udhcpc/default.script | 4 |
2 files changed, 3 insertions, 3 deletions
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" } |