summaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-03 13:31:59 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-03 13:31:59 +0000
commitc07af084268733eab42dcccb1f8c076e0105f07b (patch)
treef30995ce2f6c105006d9bf7f8611c7488c428f3b /package/base-files
parentac1453a896b113f0a7ce8f0e1e60d6f127c417b0 (diff)
[package] base-files: also regenerate wifi config if existing config contains only whitespace
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20669 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
-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 856340f66..b4942d938 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 3587c24aa..43d0a8423 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() {