diff options
Diffstat (limited to 'data/templates/pppoe')
| -rw-r--r-- | data/templates/pppoe/ip-down.script.tmpl | 4 | ||||
| -rw-r--r-- | data/templates/pppoe/ipv6-up.script.tmpl | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/data/templates/pppoe/ip-down.script.tmpl b/data/templates/pppoe/ip-down.script.tmpl index bac4155d6..c1d1132b3 100644 --- a/data/templates/pppoe/ip-down.script.tmpl +++ b/data/templates/pppoe/ip-down.script.tmpl @@ -33,6 +33,6 @@ vtysh -c "conf t" ${VRF_NAME} -c "no ipv6 route ::/0 {{ ifname }} ${VRF_NAME}" {% endif %} {% if dhcpv6_options is defined and dhcpv6_options.pd is defined %} -# Stop wide dhcpv6 client -systemctl stop dhcp6c@{{ ifname }}.service +# Stop wide dhcpv6 client without blocking (by default the ip-down script can only run up to 5 seconds) +systemctl stop --no-block dhcp6c@{{ ifname }}.service {% endif %} 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 %} |