From 44e8cd27f9c65da6f6a6de29efa9cf6d8db404aa Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 8 Nov 2011 14:43:55 +0000 Subject: [PATCH] base-files: merge r28860 SVN-Revision: 28861 --- package/base-files/Makefile | 2 +- package/base-files/files/sbin/wifi | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f38792887a..63bae5753f 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:=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 e21ea6ba9e..8545bfeded 100755 --- 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() { -- 2.30.2