base-files: fix duplicate wifi radio sections when using phy renaming

The duplicate sections are caused by a race condition at boot, when board.json
is not available. In that case, the final phy name cannot be resolved, and extra
sections referring to the path are created.
Fix this by making sure that wifi config is not being run before board.json
is created.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit b993a00b82)
This commit is contained in:
Felix Fietkau
2023-07-17 14:32:21 +02:00
committed by Hela Saadani
parent e4635d24b2
commit be66809b8b
2 changed files with 4 additions and 0 deletions

View File

@@ -40,6 +40,7 @@ boot() {
grep -q pstore /proc/filesystems && /bin/mount -o noatime -t pstore pstore /sys/fs/pstore
[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
touch /tmp/.config_pending
/sbin/kmodloader
[ ! -f /etc/config/wireless ] && {
@@ -48,6 +49,8 @@ boot() {
}
/bin/config_generate
rm -f /tmp/.config_pending
/sbin/wifi config
uci_apply_defaults
sync

View File

@@ -175,6 +175,7 @@ wifi_detect_notice() {
}
wifi_config() {
[ -e /tmp/.config_pending ] && return
[ ! -f /etc/config/wireless ] && touch /etc/config/wireless
for driver in $DRIVERS; do (