Răsfoiți Sursa

netifd: localize internally used shell variables (#11567)

SVN-Revision: 32192
Jo-Philipp Wich 13 ani în urmă
părinte
comite
eb9b3bdb4f

+ 1 - 0
package/netifd/files/lib/netifd/proto/dhcp.sh

@@ -18,6 +18,7 @@ proto_dhcp_setup() {
 	local config="$1"
 	local config="$1"
 	local iface="$2"
 	local iface="$2"
 
 
+	local ipaddr hostname clientid vendorid broadcast reqopts
 	json_get_vars ipaddr hostname clientid vendorid broadcast reqopts
 	json_get_vars ipaddr hostname clientid vendorid broadcast reqopts
 
 
 	local opt dhcpopts
 	local opt dhcpopts

+ 2 - 1
package/netifd/files/lib/network/config.sh

@@ -5,6 +5,7 @@
 
 
 find_config() {
 find_config() {
 	local device="$1"
 	local device="$1"
+	local ifdev ifl3dev ifobj
 	for ifobj in `ubus list network.interface.\*`; do
 	for ifobj in `ubus list network.interface.\*`; do
 		interface="${ifobj##network.interface.}"
 		interface="${ifobj##network.interface.}"
 		(
 		(
@@ -36,7 +37,7 @@ ubus_call() {
 
 
 fixup_interface() {
 fixup_interface() {
 	local config="$1"
 	local config="$1"
-	local ifname type
+	local ifname type device l3dev
 
 
 	config_get type "$config" type
 	config_get type "$config" type
 	config_get ifname "$config" ifname
 	config_get ifname "$config" ifname