aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-04-03 13:31:59 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-04-03 13:31:59 +0000
commit10c00a63684c778d05306f5d3c8ea1a262a6ced2 (patch)
treea3b6c250df97da7d0ce0be79709ecb0a7add1373
parenta0a640003469941c9067d8fab6e272a088aa45d8 (diff)
downloadupstream-10c00a63684c778d05306f5d3c8ea1a262a6ced2.tar.gz
upstream-10c00a63684c778d05306f5d3c8ea1a262a6ced2.tar.bz2
upstream-10c00a63684c778d05306f5d3c8ea1a262a6ced2.zip
base-files: also regenerate wifi config if existing config contains only whitespace
SVN-Revision: 20669
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/etc/init.d/network7
2 files changed, 6 insertions, 3 deletions
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() {