diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-06-11 13:25:58 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-06-11 13:25:58 +0000 |
| commit | eb9b3bdb4fa10752ecaa3e667c0ff6c7b312a6ca (patch) | |
| tree | 8975505b2f1902b4babc4581fa53dcf30e2778e1 | |
| parent | 7cb42738e6d60df76ca64ee3d569e28454521c97 (diff) | |
| download | master-31e0f0ae-eb9b3bdb4fa10752ecaa3e667c0ff6c7b312a6ca.tar.gz master-31e0f0ae-eb9b3bdb4fa10752ecaa3e667c0ff6c7b312a6ca.tar.bz2 master-31e0f0ae-eb9b3bdb4fa10752ecaa3e667c0ff6c7b312a6ca.zip | |
netifd: localize internally used shell variables (#11567)
SVN-Revision: 32192
| -rwxr-xr-x | package/netifd/files/lib/netifd/proto/dhcp.sh | 1 | ||||
| -rwxr-xr-x | package/netifd/files/lib/network/config.sh | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/package/netifd/files/lib/netifd/proto/dhcp.sh b/package/netifd/files/lib/netifd/proto/dhcp.sh index 70cfc86d18..3365cb7aeb 100755 --- a/package/netifd/files/lib/netifd/proto/dhcp.sh +++ b/package/netifd/files/lib/netifd/proto/dhcp.sh @@ -18,6 +18,7 @@ proto_dhcp_setup() { local config="$1" local iface="$2" + local ipaddr hostname clientid vendorid broadcast reqopts json_get_vars ipaddr hostname clientid vendorid broadcast reqopts local opt dhcpopts diff --git a/package/netifd/files/lib/network/config.sh b/package/netifd/files/lib/network/config.sh index 3b3ae93404..9128971dab 100755 --- a/package/netifd/files/lib/network/config.sh +++ b/package/netifd/files/lib/network/config.sh @@ -5,6 +5,7 @@ find_config() { local device="$1" + local ifdev ifl3dev ifobj for ifobj in `ubus list network.interface.\*`; do interface="${ifobj##network.interface.}" ( @@ -36,7 +37,7 @@ ubus_call() { fixup_interface() { local config="$1" - local ifname type + local ifname type device l3dev config_get type "$config" type config_get ifname "$config" ifname |