netifd: prevent error in ifup if no /etc/config/wireless exists, properly handle...
authorJo-Philipp Wich <jow@openwrt.org>
Sat, 15 Sep 2012 12:50:55 +0000 (12:50 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sat, 15 Sep 2012 12:50:55 +0000 (12:50 +0000)
SVN-Revision: 33425

package/netifd/files/sbin/ifup

index 0d2a3ca10723bea4d351e9e767ac654916199954..e6dbb3541778626e170044338093a64a9e4e0186 100755 (executable)
@@ -50,7 +50,7 @@ else
        if_call "network.interface.$1"
 fi
 
-if [ -n "$setup_wifi" ] && grep -q config /etc/config/wireless; then
+if [ -n "$setup_wifi" ] && grep -sq config /etc/config/wireless; then
        . /lib/functions.sh
 
        find_related_radios() {
@@ -58,8 +58,12 @@ if [ -n "$setup_wifi" ] && grep -q config /etc/config/wireless; then
                config_get wdev "$1" device
                config_get wnet "$1" network
 
-               if [ -n "$wdev" ] && [ "$wnet" = "$network" ]; then
-                       append radio_devs "$wdev" "$N"
+               if [ -n "$wdev" ]; then
+                       for wnet in $wnet; do
+                               if [ "$wnet" = "$network" ]; then
+                                       append radio_devs "$wdev" "$N"
+                               fi
+                       done
                fi
        }