Merge branch 'master' of git.mycard.moe:mycard/nextgen-router

files/dnsmasq/dnsmasq.conf.j2

@@ -46,7 +46,7 @@ dhcp-boot=tag:efi64-2-{{interface}},netboot.xyz.efi,,{{ address }}
 server=127.0.0.1#55553
 no-resolv
 strict-order
-interface=lo{% for br in bridges %}{% if not br.masq is defined or not br.masq %},{{br.name}}{% endif %}{% endfor %}{% if dnsmasq.extraInterfaces is defined %}{% for interface in dnsmasq.extraInterfaces %},{{interface}}{% endfor %}{% endif %}
+interface=lo{% for br in bridges %}{% if br.type != 'manual' and not (br.masq is defined and br.masq) %},{{br.name}}{% endif %}{% endfor %}{% if dnsmasq.extraInterfaces is defined %}{% for interface in dnsmasq.extraInterfaces %},{{interface}}{% endfor %}{% endif %}
 
 bind-interfaces
 port=53
@@ -56,10 +56,10 @@ dhcp-no-override
 dhcp-authoritative
 enable-ra
 
-no-dhcp-interface=lo{% for br in bridges %}{% if not br.dhcp is defined or not br.dhcp %},{{br.name}}{% endif %}{% endfor %}{% if dnsmasq.extraInterfaces is defined %}{% for interface in dnsmasq.extraInterfaces %},{{interface}}{% endfor %}{% endif %}
+no-dhcp-interface=lo{% for br in bridges %}{% if br.type != 'manual' and not (br.dhcp is defined and br.dhcp) %},{{br.name}}{% endif %}{% endfor %}{% if dnsmasq.extraInterfaces is defined %}{% for interface in dnsmasq.extraInterfaces %},{{interface}}{% endfor %}{% endif %}
 
 {% for br in bridges %}
-{% if br.dhcp is defined and br.dhcp %}
+{% if br.type != 'manual' and br.dhcp is defined and br.dhcp %}
 # DHCP for {{br.name}}
 dhcp-range={{br.name}},{{br.dhcp.start}},{{br.dhcp.end}},{{br.dhcp.time}}