summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-02-16 09:36:18 +0100
committerGitHub <noreply@github.com>2024-02-16 09:36:18 +0100
commit8c860fa7c423cc2bd72f9e71a5f8c52f43e02dfa (patch)
tree4d0c0d0e7517c7cef73134771336672e3c3bcee7 /src/conf_mode
parent2ff7d80f44aa1bc8429b18417cd63eb6f7105eef (diff)
parent0fafc4bcdb9efc03796ddab0832471b11ba1bbe0 (diff)
downloadvyos-1x-8c860fa7c423cc2bd72f9e71a5f8c52f43e02dfa.tar.gz
vyos-1x-8c860fa7c423cc2bd72f9e71a5f8c52f43e02dfa.zip
Merge pull request #3016 from c-po/nht
T6001: add option to disable next-hop-tracking resolve-via-default
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/system_ip.py1
-rwxr-xr-xsrc/conf_mode/system_ipv6.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/conf_mode/system_ip.py b/src/conf_mode/system_ip.py
index 7612e2c0d..833f89554 100755
--- a/src/conf_mode/system_ip.py
+++ b/src/conf_mode/system_ip.py
@@ -127,6 +127,7 @@ def apply(opt):
# The route-map used for the FIB (zebra) is part of the zebra daemon
frr_cfg.load_configuration(zebra_daemon)
+ frr_cfg.modify_section(r'no ip nht resolve-via-default')
frr_cfg.modify_section(r'ip protocol \w+ route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)')
if 'frr_zebra_config' in opt:
frr_cfg.add_before(frr.default_add_before, opt['frr_zebra_config'])
diff --git a/src/conf_mode/system_ipv6.py b/src/conf_mode/system_ipv6.py
index 90a1a8087..00d440e35 100755
--- a/src/conf_mode/system_ipv6.py
+++ b/src/conf_mode/system_ipv6.py
@@ -104,6 +104,7 @@ def apply(opt):
# The route-map used for the FIB (zebra) is part of the zebra daemon
frr_cfg.load_configuration(zebra_daemon)
+ frr_cfg.modify_section(r'no ipv6 nht resolve-via-default')
frr_cfg.modify_section(r'ipv6 protocol \w+ route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)')
if 'frr_zebra_config' in opt:
frr_cfg.add_before(frr.default_add_before, opt['frr_zebra_config'])