From b48c7e14dc6d69c20bdcd159d38c057dfe1218f6 Mon Sep 17 00:00:00 2001 From: Janusz Dziedzic Date: Tue, 24 Jun 2025 15:36:46 +0200 Subject: [PATCH] map-agent: use correct networkid for dynamic backhaul --- .../etc/hotplug.d/ethernet/map-dynamic-backhaul | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul b/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul index 2b0bb18b1..43fcc6ed5 100755 --- a/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul +++ b/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul @@ -61,6 +61,14 @@ remove_from_bridge() { [ -n "$ifname" ] && brctl delif ${al_bridge} ${ifname} } +get_network_id() { + local ifname=$1 + + [ -n "$ifname" ] || return + network_id=$(wpa_cli -i $ifname list_n|tail -n 1 | awk '{print $1}') + echo ${network_id} +} + update_bstas() { section="$1" action="$2" @@ -68,14 +76,15 @@ update_bstas() { config_get ifname "$section" ifname config_get_bool enabled "$section" enabled 0 + network_id=$(get_network_id $ifname) if [ "$action" = "down" ]; then wpa_cli -i "$ifname" disconnect > /dev/null 2>&1 - wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1 + wpa_cli -i "$ifname" disable_network $network_id > /dev/null 2>&1 # wpa_cli -i "$ifname" save_config > /dev/null 2>&1 elif [ "$action" = "up" ]; then [ "$enabled" -eq 0 ] && return wpa_cli -i "$ifname" reconnect > /dev/null 2>&1 - wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1 + wpa_cli -i "$ifname" enable_network $network_id > /dev/null 2>&1 # wpa_cli -i "$ifname" save_config > /dev/null 2>&1 fi }