summaryrefslogtreecommitdiff
path: root/data/templates/pppoe/ip-up.script.tmpl
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-05-25 21:19:12 +0200
committerChristian Poessinger <christian@poessinger.com>2020-05-26 17:04:49 +0200
commit76d87858be1fc2a261f7bc94d915c08b47b49e92 (patch)
treed204c0041b29bf3a12b6cfb50a25299fae359061 /data/templates/pppoe/ip-up.script.tmpl
parentb136bd5bbb29c440d2c2745348cc5309698a3017 (diff)
downloadvyos-1x-76d87858be1fc2a261f7bc94d915c08b47b49e92.tar.gz
vyos-1x-76d87858be1fc2a261f7bc94d915c08b47b49e92.zip
pppoe: T2502: "default-route none" option had no effect
Diffstat (limited to 'data/templates/pppoe/ip-up.script.tmpl')
-rw-r--r--data/templates/pppoe/ip-up.script.tmpl14
1 files changed, 8 insertions, 6 deletions
diff --git a/data/templates/pppoe/ip-up.script.tmpl b/data/templates/pppoe/ip-up.script.tmpl
index 697ebcc20..eacc37e4e 100644
--- a/data/templates/pppoe/ip-up.script.tmpl
+++ b/data/templates/pppoe/ip-up.script.tmpl
@@ -7,13 +7,14 @@ if [ "$6" != "{{ intf }}" ]; then
fi
{% if not on_demand %}
-# See https://phabricator.vyos.net/T2248 & T2220. Determine if we are enslaved
-# to a VRF, this is needed to properly insert the default route.
-
# add some info to syslog
DIALER_PID=$(cat /var/run/{{ intf }}.pid)
logger -t pppd[$DIALER_PID] "executing $0"
+{% if default_route != 'none' -%}
+# See https://phabricator.vyos.net/T2248 & T2220. Determine if we are enslaved
+# to a VRF, this is needed to properly insert the default route.
+
SED_OPT="^ip route"
VRF_NAME=""
if [ -d /sys/class/net/{{ intf }}/upper_* ]; then
@@ -27,21 +28,22 @@ if [ -d /sys/class/net/{{ intf }}/upper_* ]; then
VRF_NAME="vrf ${VRF}"
fi
-{% if 'auto' in default_route -%}
+{% if default_route == 'auto' -%}
# Only insert a new default route if there is no default route configured
routes=$(vtysh -c "show running-config" | sed -n "/${SED_OPT}/,/!/p" | grep 0.0.0.0/0 | wc -l)
if [ "$routes" -ne 0 ]; then
exit 1
fi
-{% elif 'force' in default_route -%}
+{% elif default_route == 'force' -%}
# Retrieve current static default routes and remove it from the routing table
vtysh -c "show running-config" | sed -n "/${SED_OPT}/,/!/p" | grep 0.0.0.0/0 | while read route ; do
vtysh -c "conf t" ${VTY_OPT} -c "no ${route} ${VRF_NAME}"
done
-{% endif %}
+{% endif %}
# Add default route to default or VRF routing table
vtysh -c "conf t" ${VTY_OPT} -c "ip route 0.0.0.0/0 {{ intf }} ${VRF_NAME}"
logger -t pppd[$DIALER_PID] "added default route via {{ intf }} ${VRF_NAME}"
+{% endif %}
{% endif %}