From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 3 Apr 2010 13:44:38 +0000 (+0000)
Subject: merge r20669
X-Git-Tag: backfire_10.03~18
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b1cf1195b33485a843a2158f10ef9dc2d3539710;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r20669

SVN-Revision: 20671
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 856340f667..b4942d938c 100644
--- 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:=41
+PKG_RELEASE:=42
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
diff --git a/package/base-files/files/etc/init.d/network b/package/base-files/files/etc/init.d/network
index 3587c24aaa..43d0a84232 100755
--- a/package/base-files/files/etc/init.d/network
+++ b/package/base-files/files/etc/init.d/network
@@ -9,9 +9,12 @@ boot() {
 
 	include /lib/network
 	setup_switch
-	[ -s /etc/config/wireless ] || \
+	grep -qs config /etc/config/wireless && {
+		/sbin/wifi up
+	} || {
+		rm -f /etc/config/wireless
 		/sbin/wifi detect > /etc/config/wireless
-	/sbin/wifi up
+	}
 }
 
 start() {