summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
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/linux/brcm47xx
parentdf9efc94970ccc1e43915839ec3f49d54729cc3d (diff)
downloadmaster-31e0f0ae-1c09849f6cf1b8bd94819ca11910ce444c3d3019.tar.gz
master-31e0f0ae-1c09849f6cf1b8bd94819ca11910ce444c3d3019.tar.bz2
master-31e0f0ae-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/linux/brcm47xx')
-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
2 files changed, 9 insertions, 9 deletions
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