fix more instances of '' abuse

SVN-Revision: 4326

diff --git a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net b/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
index d5b7f6b0fadf2d5f5c0bdcee594cc8d1f0c2bc13..72146a1d78317f74f24b8b0f1eb82bc66a6fcb7a 100644 (file)
--- a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
@@ -8,8 +8,8 @@ addif() {
        
        # find all vlan configurations for this interface and set them up as well
        for ifc in $interfaces; do
-               config_get type "$ifc" type
-               case "$type" in
+               config_get iftype "$ifc" type
+               case "$iftype" in
                        bridge) config_get ifs "$ifc" ifnames;;
                        *) config_get ifs "$ifc" ifname;;
                esac

diff --git a/openwrt/package/base-files/default/lib/network/config.sh b/openwrt/package/base-files/default/lib/network/config.sh
index 59ec84aba828c617793de98e6698315dca9edc1c..76db09de15dfc3137ebfc57874e601b812547ab9 100755 (executable)
--- a/openwrt/package/base-files/default/lib/network/config.sh
+++ b/openwrt/package/base-files/default/lib/network/config.sh
@@ -4,11 +4,11 @@
 # DEBUG="echo"
 
 find_config() {
-       local type iface ifn
+       local iftype iface ifn
        for ifn in $interfaces; do
-               config_get type "$ifn" type
+               config_get iftype "$ifn" type
                config_get iface "$ifn" ifname
-               case "$type" in
+               case "$iftype" in
                        bridge)
                                config_get iface "$ifn" ifnames
                        ;;
@@ -25,15 +25,15 @@ find_config() {
 }
 
 scan_interfaces() {
-       local mode type iface
+       local mode iftype iface
        interfaces=
        config_cb() {
-               config_get type "$CONFIG_SECTION" TYPE
-               case "$type" in
+               config_get iftype "$CONFIG_SECTION" TYPE
+               case "$iftype" in
                        interface)
-                               config_get type "$CONFIG_SECTION" type
+                               config_get iftype "$CONFIG_SECTION" type
                                config_get mode "$CONFIG_SECTION" proto
-                               case "$type" in
+                               case "$iftype" in
                                        bridge)
                                                config_get iface "$CONFIG_SECTION" ifname
                                                iface="${iface:-br-$CONFIG_SECTION}"

diff --git a/openwrt/package/base-files/default/sbin/ifdown b/openwrt/package/base-files/default/sbin/ifdown
index 7debb9559fdb5fbdad1f7ba4ba2b27018d646855..1334ee8218310b16f487756801c6f314b247e99d 100755 (executable)
--- a/openwrt/package/base-files/default/sbin/ifdown
+++ b/openwrt/package/base-files/default/sbin/ifdown
@@ -6,14 +6,14 @@
 include network
 scan_interfaces
 
-debug "### ifdown $type ###"
-type=$1
+cfg=$1
+debug "### ifdown $cfg ###"
 
-config_get proto "$type" proto
+config_get proto "$cfg" proto
 [ -z "$proto" ] && { echo "interface not found."; exit; }
 
 # kill active ppp daemon
-pid="$(cat /var/run/ppp-${type}.pid 2>/dev/null)"
+pid="$(cat /var/run/ppp-${cfg}.pid 2>/dev/null)"
 [ -n "$pid" -a -d "/proc/$pid" ] && {
        kill $pid
        sleep 1
@@ -21,14 +21,14 @@ pid="$(cat /var/run/ppp-${type}.pid 2>/dev/null)"
 }
 
 # kill any other process associated with the interface
-config_get ifname "$type" ifname
+config_get ifname "$cfg" ifname
 pid="$(cat /var/run/${ifname}.pid 2>/dev/null)"
 [ -n "$pid" -a -d "/proc/$pid" ] && kill -9 $pid
 
-config_get ifname "$type" ifname
+config_get ifname "$cfg" ifname
 ifconfig "$ifname" >/dev/null 2>/dev/null && {
        ifconfig "$ifname" 0.0.0.0 down
 
-       config_get iftype "$type" type
+       config_get iftype "$cfg" type
        [ "$iftype" = "bridge" ] && brctl delbr "$ifname"
 }

diff --git a/openwrt/package/base-files/default/sbin/wifi b/openwrt/package/base-files/default/sbin/wifi
index f1ac94fa3a02469dceb9af6eaa3461b33c35d1bc..b228eed8a05d0f03b33f2d038dbfe73c1f3b611a 100755 (executable)
--- a/openwrt/package/base-files/default/sbin/wifi
+++ b/openwrt/package/base-files/default/sbin/wifi
@@ -33,12 +33,12 @@ config_load wireless
 include wifi
 
 for device in $DEVICES; do (
-       config_get type "$device" type
-       eval "type setup_$type" 2>/dev/null >/dev/null && {
-               eval "scan_$type '$device'"
-               eval "setup_$type '$device'" && {
+       config_get iftype "$device" type
+       eval "type setup_$iftype" 2>/dev/null >/dev/null && {
+               eval "scan_$iftype '$device'"
+               eval "setup_$iftype '$device'" && {
                        # TODO: set up network settings
                        /bin/true
-               } || echo "$device($type): Setup failed" || true
-       } || echo "$device($type): Interface type not supported"
+               } || echo "$device($iftype): Setup failed" || true
+       } || echo "$device($iftype): Interface type not supported"
 ); done

diff --git a/openwrt/package/broadcom-wl/files/lib/wifi/broadcom.sh b/openwrt/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 53d1cf7925348f2676b8b97e86c06ee56b5f95c0..7852ae96253c138a8bc36bac67f771896f5ebf91 100644 (file)
--- a/openwrt/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/openwrt/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -5,8 +5,8 @@ bridge_interface() {
                scan_interfaces
                cfg="$(find_config "$1")"
                [ -z "$cfg" ] && return 0
-               config_get type "$cfg" type
-               [ "$type" = bridge ] && config_get "$type" bridge
+               config_get iftype "$cfg" type
+               [ "$iftype" = bridge ] && config_get "$iftype" bridge
        )
 }