summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-01-30 13:46:06 +0100
committerGitHub <noreply@github.com>2021-01-30 13:46:06 +0100
commitcd19bd15ca2adf4a36793a6c88ffd9f35fae85a0 (patch)
tree4111f4295dc7654afdfde793bfd0a9e2ff4a7465
parent14b3d4c35d94c88355722efd119acb7b64f0d0dc (diff)
parent2dc11253e46b945adb392c5946fd9ad43f391d86 (diff)
downloadvyos-1x-cd19bd15ca2adf4a36793a6c88ffd9f35fae85a0.tar.gz
vyos-1x-cd19bd15ca2adf4a36793a6c88ffd9f35fae85a0.zip
Merge pull request #711 from samburney/current
pppoe: T3273: Leave default-route in place if 'default-route' is set to 'none'
-rw-r--r--data/templates/pppoe/ip-down.script.tmpl6
1 files changed, 4 insertions, 2 deletions
diff --git a/data/templates/pppoe/ip-down.script.tmpl b/data/templates/pppoe/ip-down.script.tmpl
index 5e119f796..bac4155d6 100644
--- a/data/templates/pppoe/ip-down.script.tmpl
+++ b/data/templates/pppoe/ip-down.script.tmpl
@@ -23,10 +23,12 @@ if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
VRF_NAME="vrf ${VRF_NAME}"
fi
-# Always delete default route when interface goes down
+{% if default_route != 'none' %}
+# Always delete default route when interface goes down if we installed it
vtysh -c "conf t" ${VRF_NAME} -c "no ip route 0.0.0.0/0 {{ ifname }} ${VRF_NAME}"
-{% if ipv6 is defined and ipv6.address is defined and ipv6.address.autoconf is defined %}
+{% if ipv6 is defined and ipv6.address is defined and ipv6.address.autoconf is defined %}
vtysh -c "conf t" ${VRF_NAME} -c "no ipv6 route ::/0 {{ ifname }} ${VRF_NAME}"
+{% endif %}
{% endif %}
{% endif %}