[PATCH] fff-wireless: initialize WiFi config before setting up wXsta

Adrian Schmutzler freifunk at adrianschmutzler.de
Mo Nov 25 13:19:30 CET 2019


The script for setting up wXsta (/etc/uci-defaults/24c-fff-wXsta) runs
before the main WiFi config script (/etc/uci-defaults/60-fff-wireless),
so the wXsta config is deleted again by

config_foreach removeWifiIface wifi-iface

This moves the latter script (and another script for WiFi config)
before the wXsta setup, so the WiFi config will be set up correctly.

Reported-by: Christian Dresel <fff at chrisi01.de>
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>

---

Please double check whether this break anything, as I do not remember
the details of the initialization sequence in the old firmware.
---
 src/packages/fff/fff-wireless/Makefile                          | 2 +-
 .../etc/uci-defaults/{60-fff-wireless => 24a-fff-wireless}      | 0
 .../uci-defaults/{62-config-wireless => 24b-config-wireless}    | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename src/packages/fff/fff-wireless/files/etc/uci-defaults/{60-fff-wireless => 24a-fff-wireless} (100%)
 rename src/packages/fff/fff-wireless/files/etc/uci-defaults/{62-config-wireless => 24b-config-wireless} (100%)

diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile
index 8d053453..39640c1c 100644
--- a/src/packages/fff/fff-wireless/Makefile
+++ b/src/packages/fff/fff-wireless/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-wireless
-PKG_RELEASE:=11
+PKG_RELEASE:=12
 
 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/24a-fff-wireless
similarity index 100%
rename from src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless
rename to src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless
diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/62-config-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless
similarity index 100%
rename from src/packages/fff/fff-wireless/files/etc/uci-defaults/62-config-wireless
rename to src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless
-- 
2.20.1



Mehr Informationen über die Mailingliste franken-dev