diff --git a/scripts/reset-dev-env.sh b/scripts/reset-dev-env.sh index c0b3adabe..39c5c966a 100755 --- a/scripts/reset-dev-env.sh +++ b/scripts/reset-dev-env.sh @@ -110,10 +110,12 @@ fi # Remove veth persistence units (Fix 1, mulga-998.b). Without this, systemd-networkd # recreates the veth on next reboot even after a full dev reset. if [ -e /etc/systemd/network/15-spinifex-veth-wan.netdev ] || \ - [ -e /etc/systemd/network/15-spinifex-veth-wan.network ]; then + [ -e /etc/systemd/network/15-spinifex-veth-wan.network ] || \ + [ -e /etc/systemd/network/16-spinifex-veth-wan-ovs.network ]; then echo " Deleting veth persistence units" sudo rm -f /etc/systemd/network/15-spinifex-veth-wan.netdev \ - /etc/systemd/network/15-spinifex-veth-wan.network + /etc/systemd/network/15-spinifex-veth-wan.network \ + /etc/systemd/network/16-spinifex-veth-wan-ovs.network sudo networkctl reload 2>/dev/null || true fi diff --git a/scripts/setup-ovn.sh b/scripts/setup-ovn.sh index a8f21c9ba..f2e73cb39 100755 --- a/scripts/setup-ovn.sh +++ b/scripts/setup-ovn.sh @@ -312,7 +312,8 @@ if [ -n "$WAN_BRIDGE" ]; then # bridge plumbing (Fix 1, mulga-998.b, per D17). if [ "$WAN_BRIDGE_MODE" != "veth" ]; then sudo rm -f /etc/systemd/network/15-spinifex-veth-wan.netdev \ - /etc/systemd/network/15-spinifex-veth-wan.network + /etc/systemd/network/15-spinifex-veth-wan.network \ + /etc/systemd/network/16-spinifex-veth-wan-ovs.network sudo networkctl reload 2>/dev/null || true sudo ovs-vsctl --if-exists del-port "$WAN_BRIDGE" veth-wan-ovs sudo ip link del veth-wan-br 2>/dev/null || true @@ -377,6 +378,7 @@ if [ -n "$WAN_BRIDGE" ]; then # silently falls back to direct mode (Fix 1, mulga-998.b). VETH_NETDEV="/etc/systemd/network/15-spinifex-veth-wan.netdev" VETH_NETWORK="/etc/systemd/network/15-spinifex-veth-wan.network" + VETH_OVS_NETWORK="/etc/systemd/network/16-spinifex-veth-wan-ovs.network" sudo tee "$VETH_NETDEV" >/dev/null </dev/null </dev/null || true - echo " wrote $VETH_NETDEV + $VETH_NETWORK (veth persists on reboot)" + echo " wrote $VETH_NETDEV + $VETH_NETWORK + $VETH_OVS_NETWORK (veth persists on reboot)" ;; direct)