[PATCH v3 07/14] fff-wireless: No initial setup of dummy interfaces

Adrian Schmutzler freifunk at adrianschmutzler.de
Mo Apr 22 14:35:30 CEST 2019


This removes the dummy WiFi interfaces set up during first boot.

Note that we have to set up the phys, since the default settings
provided by LEDE include disabled=1!

Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
Tested-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian at blaese.de>
Reviewed-by: Tim Niemeyer <tim at tn-x.org>

---

Changes in v2:
- Added to patchset

Changes in v3:
none
---
 src/packages/fff/fff-wireless/Makefile                         |  3 +--
 .../fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless    | 10 ----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile
index 3bc1862b..5a478409 100644
--- a/src/packages/fff/fff-wireless/Makefile
+++ b/src/packages/fff/fff-wireless/Makefile
@@ -1,8 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-wireless
-PKG_VERSION:=6
-PKG_RELEASE:=1
+PKG_RELEASE:=7
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless
index 7e2fcf97..860f47f6 100644
--- a/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless
+++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless
@@ -17,16 +17,6 @@ for phy in $(iw phy | awk '/^Wiphy/{ print $2 }'); do
 		echo "Can't create radio for $phy"
 		exit 1
 	fi
-
-	if ! wifiAddAP "$radio" "do.not.use" "mesh" "ap" "0" ; then
-		echo "Can't add AP interface on $radio."
-		exit 1
-	fi
-
-	if ! wifiAddMesh "$radio" "mesh.do.not.use" ; then
-		echo "Can't add Mesh interface on $radio."
-		exit 1
-	fi
 done
 
 # vim: set noexpandtab:tabstop=4
-- 
2.11.0



Mehr Informationen über die Mailingliste franken-dev