From c39de8f7d5c5f0860b5c0b95b6493ba85bee8eea Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 27 Nov 2019 15:34:45 +0100 Subject: [PATCH] fff-wireless: initialize WiFi config before setting up wXsta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Fixes: #128 Fixes: 3d9eb1db2ee3 ("fff-hoods/fff-wireless: Reconfigure instead of delete and create") Reported-by: Christian Dresel Signed-off-by: Adrian Schmutzler Reviewed-by: Fabian Bläse --- 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