base-files: properly handle wifi ifaces with no network attached, useful for unmanage...

SVN-Revision: 28860

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c3b03508893a9b9c428a2169f119cb1f6c7721a4..2b1cfa13b3e9349f9aa9f298049be232a12a114a 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=88
+PKG_RELEASE:=89
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 2e66bfcbe8d113accdf911c2dd0423d2bed95be5..5cbf50b5f5eae06ef95c3bfc0194d8fe41937bb2 100755 (executable)
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -129,9 +129,11 @@ start_net() {(
        local vifmac="$3"
 
        [ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
-       include /lib/network
-       scan_interfaces
-       setup_interface "$iface" "$config" "" "$vifmac"
+       [ -z "$config" ] || {
+               include /lib/network
+               scan_interfaces
+               setup_interface "$iface" "$config" "" "$vifmac"
+       }
 )}
 
 set_wifi_up() {