[backfire] base-files: merge r28860

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28861 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f38792887ac5f1378202d4476e46da4d0d555036..63bae5753f0602602f53f8379d833cfbb32a1231 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:=43.29
+PKG_RELEASE:=43.30
 
 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 e21ea6ba9edfbad5e9a5545663f31f0341dcd273..8545bfededcb0169552ce41cc4ef961dcb86f686 100755 (executable)
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -120,9 +120,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() {