From 442010c4b86bdc0600f9c86c4b029b539aa979b2 Mon Sep 17 00:00:00 2001 From: Andreas Wrede Date: Wed, 23 Sep 2026 14:27:04 -0400 Subject: [PATCH] deploy: render dnsmasq/br0 configs, install LAN file as 05-van-lan van-ap-dnsmasq.conf and 21-van-br0.network carry @TOKEN@ placeholders but were installed unrendered. Armbian's netplan-generated 10-netplan-* file matched the LAN port before 22-van-lan.network, so it was never bridged. Co-Authored-By: Claude Sonnet 5 --- deploy.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/deploy.sh b/deploy.sh index 9bc6b54..88d37b1 100755 --- a/deploy.sh +++ b/deploy.sh @@ -128,12 +128,17 @@ install_rendered ap/11-van-ap-2g.network /etc/systemd/network/11-van-ap-2g.ne install -D -m0644 ap/van-ap-watchdog-2g.service /etc/systemd/system/van-ap-watchdog-2g.service install -D -m0755 ap/van-ap-watchdog /usr/local/sbin/van-ap-watchdog install -D -m0644 ap/van-ap-watchdog.service /etc/systemd/system/van-ap-watchdog.service -install -D -m0644 ap/van-ap-dnsmasq.conf /etc/van-ap/dnsmasq.conf +install_rendered ap/van-ap-dnsmasq.conf /etc/van-ap/dnsmasq.conf install -D -m0644 ap/van-ap-dnsmasq.service /etc/systemd/system/van-ap-dnsmasq.service install_rendered ap/10-van-ap.network /etc/systemd/network/10-van-ap.network install -D -m0644 ap/20-van-br0.netdev /etc/systemd/network/20-van-br0.netdev -install -D -m0644 ap/21-van-br0.network /etc/systemd/network/21-van-br0.network -install_rendered ap/22-van-lan.network /etc/systemd/network/22-van-lan.network +install_rendered ap/21-van-br0.network /etc/systemd/network/21-van-br0.network +# Named 05- (not 22-) so it sorts before Armbian's netplan-generated +# /run/systemd/network/10-netplan-all-eth-interfaces.network, which matches +# every e* port with DHCP and otherwise wins over this file (first match by +# filename), leaving the LAN port un-bridged. +install_rendered ap/22-van-lan.network /etc/systemd/network/05-van-lan.network +rm -f /etc/systemd/network/22-van-lan.network install -D -m0644 ap/23-van-lan-eth0.network /etc/systemd/network/23-van-lan-eth0.network install_rendered ap/van-ap-unmanaged.conf /etc/NetworkManager/conf.d/van-ap-unmanaged.conf # Mask dracut's initramfs-generated catch-all (/run/systemd/network/