fff-wireless: initialize WiFi config before setting up wXsta

Submitted by Adrian Schmutzler on Nov. 25, 2019, 12:19 p.m.

Details

Message ID 20191125121930.1333-1-freifunk@adrianschmutzler.de
State Superseded
Headers show

Commit Message

Adrian Schmutzler Nov. 25, 2019, 12:19 p.m. 
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@chrisi01.de>
Signed-off-by: Adrian Schmutzler <freifunk@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%)

Patch hide | download patch | download mbox 

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

Comments

Adrian Schmutzler Nov. 25, 2019, 12:28 p.m. 
Da gehört noch ein 

Fixes: 3d9eb1db2ee3 ("fff-hoods/fff-wireless: Reconfigure instead of delete and create")

in die commit message.

Für spätere Referenz:

root@OpenWrt:~# ls -lah /rom/etc/uci-defaults/
drwxr-xr-x    2 root     root         623 Nov  5 15:12 .
drwxr-xr-x   19 root     root        2.0K Nov  5 15:12 ..
-rw-r--r--    1 root     root        1.6K Nov  5 15:12 03_network-switchX-migration
-rw-r--r--    1 root     root         339 Nov  5 15:12 03_network-vlan-migration
-rw-r--r--    1 root     root        1.4K Nov  5 15:12 04_led_migration
-rw-r--r--    1 root     root        1.1K Nov  5 15:12 05-config-system-migration
-rw-r--r--    1 root     root         378 Nov  5 15:12 09_fix-checksum
-rw-r--r--    1 root     root         282 Nov  5 15:12 09_fix-seama-header
-rw-r--r--    1 root     root         406 Nov  5 15:12 10_migrate-shadow
-rw-r--r--    1 root     root         380 Nov  5 15:12 12_network-generate-ula
-rw-r--r--    1 root     root         189 Nov  5 15:12 13_fix_group_user
-rw-r--r--    1 root     root         727 Nov  5 15:12 24c-fff-wXsta
-rw-r--r--    1 root     root        1.4K Nov  5 15:12 30_uboot-envtools
-rw-r--r--    1 root     root        1.8K Nov  5 15:12 50-fff-boardname
-rw-r--r--    1 root     root         258 Nov  5 15:12 51-fff-alfred
-rw-r--r--    1 root     root         190 Nov  5 15:12 51-fff-timeserver
-rw-r--r--    1 root     root         106 Nov  5 15:12 52-fff-macnock
-rw-r--r--    1 root     root         737 Nov  5 15:12 55_fff-fastd
-rw-r--r--    1 root     root        2.3K Nov  5 15:12 60-fff-wireless
-rw-r--r--    1 root     root        1.0K Nov  5 15:12 62-config-wireless
-rw-r--r--    1 root     root         215 Nov  5 15:12 80-banner-info
-rw-r--r--    1 root     root         507 Nov  5 15:12 93-fff-batman-adv
-rw-r--r--    1 root     root         535 Nov  5 15:12 93-fff-nodewatcher
-rw-r--r--    1 root     root        1.3K Nov  5 15:12 93-fff-uhttpd
-rw-r--r--    1 root     root        1.0K Nov  5 15:12 98-configure-fff
-rw-r--r--    1 root     root         287 Nov  5 15:12 99-fff-sysupgrade


> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of
> Adrian Schmutzler
> Sent: Montag, 25. November 2019 13:20
> To: franken-dev@freifunk.net
> Subject: [PATCH] fff-wireless: initialize WiFi config before setting up wXsta
> 
> 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@chrisi01.de>
> Signed-off-by: Adrian Schmutzler <freifunk@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
Adrian Schmutzler Nov. 25, 2019, 12:30 p.m. 
Und ein
Fixes: #128

(War die Syntax so?)

> Subject: RE: [PATCH] fff-wireless: initialize WiFi config before setting up wXsta
Fabian Blaese Nov. 27, 2019, 10:03 a.m. 
Hallo Adrian,

das sollte das Problem auf jeden Fall lösen.

Ich verstehe jetzt nicht ganz, warum wir da jetzt auch noch Buchstaben drin haben, die knapp aufeinander folgen.
Das erhöht jetzt schon ordentlich die Chance, dass man das bald nochmal neu durchnummerieren muss..

Reviewed-by: Fabian Bläse <fabian@blaese.de>

Gruß
Fabian

On 25.11.19 13:19, Adrian Schmutzler wrote:
> 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@chrisi01.de>
> Signed-off-by: Adrian Schmutzler <freifunk@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
>