From c9b33da5260db44c70e066f61711e61f7341bf1e Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 19 Apr 2022 19:59:34 +0200 Subject: pppoe: static: T4379: bugfix default-route lost after applying additional static routes Issue is identical to the problem in T3680 (05aa22dcb4ce) which was for DHCP based routes. Once a static route is added to the system, the PPPoE auto-installed default route is lost. --- data/templates/frr/staticd.frr.j2 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/templates/frr/staticd.frr.j2 b/data/templates/frr/staticd.frr.j2 index 08b2a3dab..cf8448f7f 100644 --- a/data/templates/frr/staticd.frr.j2 +++ b/data/templates/frr/staticd.frr.j2 @@ -18,9 +18,14 @@ vrf {{ vrf }} {# IPv4 default routes from DHCP interfaces #} {% if dhcp is vyos_defined %} {% for interface, interface_config in dhcp.items() %} -{% 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.distance }} +{# PPPoE routes behave a bit different ... #} +{% if interface.startswith('pppoe') and interface_config.default_route is vyos_defined and interface_config.default_route is not vyos_defined('none') %} +{{ ip_prefix }} route 0.0.0.0/0 {{ interface }} tag 210 +{% else %} +{% 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.distance if interface_config.distance is vyos_defined }} +{% endif %} {% endif %} {% endfor %} {% endif %} -- cgit v1.2.3