diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-05-01 15:32:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-01 15:32:01 +0100 |
| commit | 5d139bb01b1a5a5f19007699545e499524b8cd5f (patch) | |
| tree | 8318418df6bc8c8fe8271b8f8af2f60a540b00f8 /data | |
| parent | bcbecf52df2b0395aed6098b984dd69cbe33551a (diff) | |
| parent | d4f16d4813328d9ebb052e4b3e39fc4e94e45fca (diff) | |
| download | vyos-1x-5d139bb01b1a5a5f19007699545e499524b8cd5f.tar.gz vyos-1x-5d139bb01b1a5a5f19007699545e499524b8cd5f.zip | |
Merge pull request #4470 from ryanzuwala/current
router-advert: T7389: Duplicate prefix safeguard
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/router-advert/radvd.conf.j2 | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/data/templates/router-advert/radvd.conf.j2 b/data/templates/router-advert/radvd.conf.j2 index e37cfde6c..34f8e1f6d 100644 --- a/data/templates/router-advert/radvd.conf.j2 +++ b/data/templates/router-advert/radvd.conf.j2 @@ -57,12 +57,20 @@ interface {{ iface }} { }; {% endfor %} {% endif %} -{% if iface_config.auto_ignore is vyos_defined %} +{% if iface_config.prefix is vyos_defined and "::/64" in iface_config.prefix %} +{% if iface_config.auto_ignore is vyos_defined or iface_config.prefix | count > 1 %} autoignoreprefixes { -{% for auto_ignore_prefix in iface_config.auto_ignore %} +{% if iface_config.auto_ignore is vyos_defined %} +{% for auto_ignore_prefix in (iface_config.auto_ignore + iface_config.prefix | list) | reject("eq", "::/64") | unique %} {{ auto_ignore_prefix }}; -{% endfor %} +{% endfor %} +{% else %} +{% for auto_ignore_prefix in iface_config.prefix | reject("eq", "::/64") %} + {{ auto_ignore_prefix }}; +{% endfor %} +{% endif %} }; +{% endif %} {% endif %} {% if iface_config.prefix is vyos_defined %} {% for prefix, prefix_options in iface_config.prefix.items() %} |