summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-09-04 08:19:43 +0200
committerGitHub <noreply@github.com>2022-09-04 08:19:43 +0200
commit088f673f5f02c364bf445f06e178e79ea7ae4411 (patch)
treef1ed18b3807c54d53fe4947f820d54359bec260e
parente8eed64ae7416177904b5e97b9a36b0229470653 (diff)
parent8285902d3f4eab7038d086df9284eb3d538c693c (diff)
downloadvyos-1x-088f673f5f02c364bf445f06e178e79ea7ae4411.tar.gz
vyos-1x-088f673f5f02c364bf445f06e178e79ea7ae4411.zip
Merge pull request #1498 from initramfs/fix-v6-default-route
pppoe: T4648: fix incorrect installation of IPv6 default route even when default-route is set to none
-rw-r--r--data/templates/pppoe/ipv6-up.script.tmpl8
1 files changed, 8 insertions, 0 deletions
diff --git a/data/templates/pppoe/ipv6-up.script.tmpl b/data/templates/pppoe/ipv6-up.script.tmpl
index 7e1bc33b4..238f8c28e 100644
--- a/data/templates/pppoe/ipv6-up.script.tmpl
+++ b/data/templates/pppoe/ipv6-up.script.tmpl
@@ -36,6 +36,14 @@ echo 1 > /proc/sys/net/ipv6/conf/{{ ifname }}/forwarding
#
echo 2 > /proc/sys/net/ipv6/conf/{{ ifname }}/accept_ra
+{% if default_route == 'none' %}
+# Prevent learning of default router from router advertisements
+echo 0 > /proc/sys/net/ipv6/conf/{{ ifname }}/accept_ra_defrtr
+{% else %}
+# Enable learning of default router from router advertisements
+echo 1 > /proc/sys/net/ipv6/conf/{{ ifname }}/accept_ra_defrtr
+{% endif %}
+
# Autoconfigure addresses using Prefix Information in Router Advertisements.
echo 1 > /proc/sys/net/ipv6/conf/{{ ifname }}/autoconf
{% endif %}