apply-network: ignore VANLINK_WAN_NETPLAN; pin with a test

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KqhjP7nud5gdBg25zCiRk9
2026-09-23 19:13:43 -04:00
parent 698f9ee446
commit 8baddceb96
2 changed files with 6 additions and 1 deletions
@@ -516,7 +516,7 @@ apply_network() {  # ./deploy.sh --apply-network [--force] — explicit, root; c
    if [ "$force" = 0 ] && [ "$(apply_status_blocks_run "$st")" = yes ]; then
        die "the last apply did not finish cleanly: $(cat "$st" 2>/dev/null) — inspect $st and $log, check the backup dir named there, then re-run with --force"
    fi
-    if [ "$force" = 0 ] && [ "$(nm_wan_state_netplan)" = matches ] && [ ! -e /etc/netplan/10-dhcp-all-interfaces.yaml ]; then
+    if [ "$force" = 0 ] && [ "$(VANLINK_WAN_NETPLAN='' nm_wan_state_netplan)" = matches ] && [ ! -e /etc/netplan/10-dhcp-all-interfaces.yaml ]; then
        echo "nothing to apply (WAN netplan already matches; use --force to re-apply)"
        return 0
    fi