From f1eda43e735ccdf79f0d7b8bf9def58bf2462b86 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 15 Sep 2012 12:50:55 +0000 Subject: [PATCH] netifd: prevent error in ifup if no /etc/config/wireless exists, properly handle wifi-iface sections which are part of multiple networks SVN-Revision: 33425 --- package/netifd/files/sbin/ifup | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/netifd/files/sbin/ifup b/package/netifd/files/sbin/ifup index 0d2a3ca107..e6dbb35417 100755 --- a/package/netifd/files/sbin/ifup +++ b/package/netifd/files/sbin/ifup @@ -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 }