diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-12-11 21:07:28 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-12-16 22:24:50 +0100 |
| commit | 2e4725cd77a33f91e091d86d94056f43dafd153d (patch) | |
| tree | 0165c80754a6dea656c915794508ca47fcf1668c /data/templates/frr/zebra.route-map.frr.j2 | |
| parent | 55683a8406e17408021437cb35b57c48bd8b2ab1 (diff) | |
| download | vyos-1x-2e4725cd77a33f91e091d86d94056f43dafd153d.tar.gz vyos-1x-2e4725cd77a33f91e091d86d94056f43dafd153d.zip | |
frr: T6746: handle "system ip" and "system ipv6" with FRRender class
FRR 10.2 will use "[no] ip forwarding" and "[no] ipv6 forwarding" to enable or
disable IP(v6) forwarding. We no longer rely on sysctl as this was overridden
by FRR later on.
Remove code path for sysctl setting and solely rely on FRR.
Diffstat (limited to 'data/templates/frr/zebra.route-map.frr.j2')
| -rw-r--r-- | data/templates/frr/zebra.route-map.frr.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/data/templates/frr/zebra.route-map.frr.j2 b/data/templates/frr/zebra.route-map.frr.j2 index 669d58354..70a810f43 100644 --- a/data/templates/frr/zebra.route-map.frr.j2 +++ b/data/templates/frr/zebra.route-map.frr.j2 @@ -1,4 +1,6 @@ ! +{{ 'no ' if disable_forwarding is vyos_defined }}{{ afi }} forwarding +! {% if nht.no_resolve_via_default is vyos_defined %} no {{ afi }} nht resolve-via-default {% endif %} |