fix(setup-network): use remove_network instead of disable_network and drop interface bounce to prevent AP fallback

This commit is contained in:
Justin Oros
2026-04-23 12:11:12 -07:00
parent 436906582c
commit bbf1d8b79a

View File

@@ -163,7 +163,7 @@ case "$NET_OPT" in
fi fi
for EID in $EXISTING_IDS; do for EID in $EXISTING_IDS; do
wpa_cli -i "$WIFI_IFACE" disable_network "$EID" >/dev/null 2>&1 || true wpa_cli -i "$WIFI_IFACE" remove_network "$EID" >/dev/null 2>&1 || true
done done
NETWORK_ID=$(wpa_cli -i "$WIFI_IFACE" add_network 2>/dev/null | tr -d '[:space:]') NETWORK_ID=$(wpa_cli -i "$WIFI_IFACE" add_network 2>/dev/null | tr -d '[:space:]')
@@ -173,7 +173,6 @@ case "$NET_OPT" in
wpa_cli -i "$WIFI_IFACE" set_network "$NETWORK_ID" ssid "\"${NEW_SSID}\"" >/dev/null wpa_cli -i "$WIFI_IFACE" set_network "$NETWORK_ID" ssid "\"${NEW_SSID}\"" >/dev/null
wpa_cli -i "$WIFI_IFACE" set_network "$NETWORK_ID" psk "${PSK}" >/dev/null wpa_cli -i "$WIFI_IFACE" set_network "$NETWORK_ID" psk "${PSK}" >/dev/null
wpa_cli -i "$WIFI_IFACE" set_network "$NETWORK_ID" freq_list "2412 2417 2422 2427 2432 2437 2442 2447 2452 2457 2462" >/dev/null
wpa_cli -i "$WIFI_IFACE" select_network "$NETWORK_ID" >/dev/null wpa_cli -i "$WIFI_IFACE" select_network "$NETWORK_ID" >/dev/null
info "Waiting for association..." info "Waiting for association..."
@@ -197,10 +196,6 @@ case "$NET_OPT" in
wpa_cli -i "$WIFI_IFACE" save_config >/dev/null 2>&1 || true wpa_cli -i "$WIFI_IFACE" save_config >/dev/null 2>&1 || true
info "Associated — renewing DHCP lease..." info "Associated — renewing DHCP lease..."
ip link set "$WIFI_IFACE" down 2>/dev/null || true
sleep 1
ip link set "$WIFI_IFACE" up 2>/dev/null || true
sleep 1
if systemctl is-active --quiet "systemd-networkd"; then if systemctl is-active --quiet "systemd-networkd"; then
networkctl reconfigure "$WIFI_IFACE" 2>/dev/null || true networkctl reconfigure "$WIFI_IFACE" 2>/dev/null || true