summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-06-25 09:11:44 +0200
committerChristian Poessinger <christian@poessinger.com>2022-06-25 09:13:07 +0200
commitb2fc5f6362a6febddfd5c7735fb3a3781cebf995 (patch)
treef8321f8df4ca1ff8b7dbcfccbc620626a6bd3f62 /data/templates
parent12aeb087c34fe4d5887a11301c2e32e4e1503436 (diff)
downloadvyos-1x-b2fc5f6362a6febddfd5c7735fb3a3781cebf995.tar.gz
vyos-1x-b2fc5f6362a6febddfd5c7735fb3a3781cebf995.zip
dhcp: pppoe: T4384: bugfix not honoring no-default-route CLI option
Commit a2ab95ff68b ("pppoe: T4384: replace default-route CLI option with common CLI nodes already present for DHCP") had an issue as the PPPoE interface options and also DHCP interface options did not honor the no-default-route option. This has been fixed.
Diffstat (limited to 'data/templates')
-rw-r--r--data/templates/frr/staticd.frr.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/frr/staticd.frr.j2 b/data/templates/frr/staticd.frr.j2
index 589f03c2c..55c05ceb7 100644
--- a/data/templates/frr/staticd.frr.j2
+++ b/data/templates/frr/staticd.frr.j2
@@ -17,7 +17,7 @@ vrf {{ vrf }}
{% endif %}
{# IPv4 default routes from DHCP interfaces #}
{% if dhcp is vyos_defined %}
-{% for interface, interface_config in dhcp.items() %}
+{% for interface, interface_config in dhcp.items() if interface_config.dhcp_options.no_default_route is not vyos_defined %}
{% set next_hop = interface | get_dhcp_router %}
{% if next_hop is vyos_defined %}
{{ ip_prefix }} route 0.0.0.0/0 {{ next_hop }} {{ interface }} tag 210 {{ interface_config.dhcp_options.default_route_distance if interface_config.dhcp_options.default_route_distance is vyos_defined }}
@@ -26,7 +26,7 @@ vrf {{ vrf }}
{% endif %}
{# IPv4 default routes from PPPoE interfaces #}
{% if pppoe is vyos_defined %}
-{% for interface, interface_config in pppoe.items() %}
+{% for interface, interface_config in pppoe.items() if interface_config.no_default_route is not vyos_defined %}
{{ ip_prefix }} route 0.0.0.0/0 {{ interface }} tag 210 {{ interface_config.default_route_distance if interface_config.default_route_distance is vyos_defined }}
{% endfor %}
{% endif %}