diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-02-16 11:06:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-16 11:06:27 +0100 |
| commit | db8b115301d5476151e7d0910ba674a683683122 (patch) | |
| tree | 8181127e90e5a8ca6e19a6b1af624acf56482eb4 /src/conf_mode | |
| parent | cefa21ae6425355cf22fbe5123b720c5881d9174 (diff) | |
| parent | 42e83b8b2cca6ba73c2663629cf92b3b2b225898 (diff) | |
| download | vyos-1x-db8b115301d5476151e7d0910ba674a683683122.tar.gz vyos-1x-db8b115301d5476151e7d0910ba674a683683122.zip | |
Merge pull request #3017 from vyos/mergify/bp/sagitta/pr-3016
T6001: add option to disable next-hop-tracking resolve-via-default (backport #3016)
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/system_ip.py | 1 | ||||
| -rwxr-xr-x | src/conf_mode/system_ipv6.py | 1 |
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']) |