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>

diff --git a/package/base-files/files/etc/rc.button/rfkill b/package/base-files/files/etc/rc.button/rfkill
index 9e2c12f8c34211f8cbda2f0cb95b41d954e36a4f..fbdda40ed56f3fd33f58895bf68be026b193ea13 100755 (executable)
--- a/package/base-files/files/etc/rc.button/rfkill
+++ b/package/base-files/files/etc/rc.button/rfkill
@@ -4,7 +4,7 @@
 
 . /lib/functions.sh
 
-local rfkill_state=0
+rfkill_state=0
 
 wifi_rfkill_set() {
        uci set wireless.$1.disabled=$rfkill_state

diff --git a/package/base-files/files/etc/uci-defaults/10_migrate-shadow b/package/base-files/files/etc/uci-defaults/10_migrate-shadow
index b7ea5718c99f93ba4deb51221e2285768b68f71c..a354844fe4a9d529db6f547383a67c67c5234e56 100644 (file)
--- a/package/base-files/files/etc/uci-defaults/10_migrate-shadow
+++ b/package/base-files/files/etc/uci-defaults/10_migrate-shadow
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-local ppwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/passwd)"
-local spwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/shadow)"
+ppwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/passwd)"
+spwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/shadow)"
 
 if [ -n "${ppwd#[\!x]}" ] && [ -z "${spwd#[\!x]}" ]; then
        logger -t migrate-shadow "Moving root password hash into shadow database"

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 bea9493c8eae4da7642d49be6d949d9a50a38e49..259d240610cb4ee22d35a79c3ffa66c453ced04f 100644 (file)
--- 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 16b81d4fe9a05e3ba08924f7eab1a107967d8b2c..357cc7f22432d2803c464de1176197ea2c2182cf 100755 (executable)
--- 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 912fe96224737a836df33fa84938a9bd858b860d..e430b41d489d9de88c52da5c28abafc54bb12ce6 100644 (file)
--- 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 01d04881c4c61eb8e667eca2a70bf37ce4fa15aa..ba197f1995dff0cb25d1528ffdfba3edf2cc8136 100755 (executable)
--- 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 7f727eb59571b5e555287c99ef36aee1a5822b6d..5b30f27e5e3843a90fe846eba331ba3d9975a84f 100644 (file)
--- 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