Просмотр исходного кода

base-files: also regenerate wifi config if existing config contains only whitespace

SVN-Revision: 20669
Jo-Philipp Wich 15 лет назад
Родитель
Сommit
10c00a6368
2 измененных файлов с 6 добавлено и 3 удалено
  1. 1 1
      package/base-files/Makefile
  2. 5 2
      package/base-files/files/etc/init.d/network

+ 1 - 1
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/
 

+ 5 - 2
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() {