From: Jo-Philipp Wich Date: Sun, 19 Sep 2010 15:04:08 +0000 (+0000) Subject: base-files: cached state vars after scan_interfaces might be out of sync when binding... X-Git-Tag: reboot~18878 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=84b7b812f31a1cefcd29c5571e8da2b7792a2e8f;p=oweals%2Fopenwrt.git base-files: cached state vars after scan_interfaces might be out of sync when binding dhcp leases, this could lead to an unconfigured wan interface in certain circumstances. Replace config_get calls with uci_get_state SVN-Revision: 23091 --- diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script index 39527778ad..92e3474bdd 100755 --- a/package/base-files/files/usr/share/udhcpc/default.script +++ b/package/base-files/files/usr/share/udhcpc/default.script @@ -21,9 +21,9 @@ setup_interface () { local user_router [ -n "$ifc" ] && { - config_get old_ip "$ifc" ipaddr - config_get old_broadcast "$ifc" broadcast - config_get old_subnet "$ifc" netmask + old_ip="$(uci_get_state network "$ifc" ipaddr)" + old_broadcast="$(uci_get_state network "$ifc" broadcast)" + old_subnet="$(uci_get_state network "$ifc" netmask)" } [ "$ip" != "$old_ip" ] \