aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-09-24 14:30:24 +0200
committerJo-Philipp Wich <jo@mein.io>2016-09-24 14:38:20 +0200
commit1c09849f6cf1b8bd94819ca11910ce444c3d3019 (patch)
tree5ceeb7ebf279d8208045f7ba83264bbed0e45115 /target
parentdf9efc94970ccc1e43915839ec3f49d54729cc3d (diff)
downloadupstream-1c09849f6cf1b8bd94819ca11910ce444c3d3019.tar.gz
upstream-1c09849f6cf1b8bd94819ca11910ce444c3d3019.tar.bz2
upstream-1c09849f6cf1b8bd94819ca11910ce444c3d3019.zip
treewide: remove bad local shell variable declarations
Local variable declarations outside of functions are illegal since the Busybox update to v1.25.0, therfore remove them from the appropriate places. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/base-files/etc/uci-defaults/03_network-vlan-migration4
-rwxr-xr-xtarget/linux/brcm47xx/base-files/etc/board.d/01_detect6
-rw-r--r--target/linux/brcm47xx/base-files/etc/uci-defaults/03_network_migration12
-rwxr-xr-xtarget/linux/lantiq/base-files/sbin/dsl_notify.sh7
-rw-r--r--target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware2
5 files changed, 13 insertions, 18 deletions
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-vlan-migration b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-vlan-migration
index bea9493c8e..259d240610 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-vlan-migration
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-vlan-migration
@@ -3,8 +3,8 @@
# Copyright (C) 2010 OpenWrt.org
#
-local dev="$(uci -q get network.@switch_vlan[0].device)"
-local vlan="$(uci -q get network.@switch_vlan[0].vlan)"
+dev="$(uci -q get network.@switch_vlan[0].device)"
+vlan="$(uci -q get network.@switch_vlan[0].vlan)"
if [ "$dev" = "rtl8366s" ] && [ "$vlan" = 0 ]; then
logger -t vlan-migration "VLAN 0 is invalid for RTL8366s, changing to 1"
diff --git a/target/linux/brcm47xx/base-files/etc/board.d/01_detect b/target/linux/brcm47xx/base-files/etc/board.d/01_detect
index 16b81d4fe9..357cc7f224 100755
--- a/target/linux/brcm47xx/base-files/etc/board.d/01_detect
+++ b/target/linux/brcm47xx/base-files/etc/board.d/01_detect
@@ -175,9 +175,9 @@ detect_by_model() {
}
-local model="$(sed -ne 's/^machine[ \t]*: //p' /proc/cpuinfo)"
-local boardtype="$(nvram get boardtype)"
-local boardnum="$(nvram get boardnum)"
+model="$(sed -ne 's/^machine[ \t]*: //p' /proc/cpuinfo)"
+boardtype="$(nvram get boardtype)"
+boardnum="$(nvram get boardnum)"
board_config_update
diff --git a/target/linux/brcm47xx/base-files/etc/uci-defaults/03_network_migration b/target/linux/brcm47xx/base-files/etc/uci-defaults/03_network_migration
index 912fe96224..e430b41d48 100644
--- a/target/linux/brcm47xx/base-files/etc/uci-defaults/03_network_migration
+++ b/target/linux/brcm47xx/base-files/etc/uci-defaults/03_network_migration
@@ -8,12 +8,12 @@ uci show network | grep "\.vlan=0"
logger -t network "network config is invalid, creating new one"
-local lan_proto="$(uci -q get network.lan.proto)"
-local lan_ipaddr="$(uci -q get network.lan.ipaddr)"
-local lan_netmask="$(uci -q get network.lan.netmask)"
-local wan_proto="$(uci -q get network.wan.proto)"
-local wan_ipaddr="$(uci -q get network.wan.ipaddr)"
-local wan_netmask="$(uci -q get network.wan.netmask)"
+lan_proto="$(uci -q get network.lan.proto)"
+lan_ipaddr="$(uci -q get network.lan.ipaddr)"
+lan_netmask="$(uci -q get network.lan.netmask)"
+wan_proto="$(uci -q get network.wan.proto)"
+wan_ipaddr="$(uci -q get network.wan.ipaddr)"
+wan_netmask="$(uci -q get network.wan.netmask)"
echo "" > /etc/config/network
config_generate
diff --git a/target/linux/lantiq/base-files/sbin/dsl_notify.sh b/target/linux/lantiq/base-files/sbin/dsl_notify.sh
index 01d04881c4..ba197f1995 100755
--- a/target/linux/lantiq/base-files/sbin/dsl_notify.sh
+++ b/target/linux/lantiq/base-files/sbin/dsl_notify.sh
@@ -16,7 +16,6 @@
include /lib/network
scan_interfaces
-local led
config_load system
config_get led led_dsl sysfs
if [ -n "$led" ]; then
@@ -28,18 +27,14 @@ if [ -n "$led" ]; then
esac
fi
-local interfaces=`ubus list network.interface.\* | cut -d"." -f3`
-local ifc
+interfaces=`ubus list network.interface.\* | cut -d"." -f3`
for ifc in $interfaces; do
- local up
json_load "$(ifstatus $ifc)"
json_get_var up up
- local auto
config_get_bool auto "$ifc" auto 1
- local proto
json_get_var proto proto
if [ "$DSL_INTERFACE_STATUS" = "UP" ]; then
diff --git a/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware b/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware
index 7f727eb595..5b30f27e5e 100644
--- a/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware
+++ b/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware
@@ -10,7 +10,7 @@
# This script sets system defaults for the hardware on firstboot
#
-local hardware=`sed -n /Hardware/s/.*:.//p /proc/cpuinfo`
+hardware=`sed -n /Hardware/s/.*:.//p /proc/cpuinfo`
wrt350nv2_default() {
# leds