From 76d87858be1fc2a261f7bc94d915c08b47b49e92 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 25 May 2020 21:19:12 +0200
Subject: pppoe: T2502: "default-route none" option had no effect

---
 data/templates/pppoe/ip-pre-up.script.tmpl |  1 -
 data/templates/pppoe/ip-up.script.tmpl     | 14 ++++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'data/templates/pppoe')

diff --git a/data/templates/pppoe/ip-pre-up.script.tmpl b/data/templates/pppoe/ip-pre-up.script.tmpl
index 9a7ba7d57..6a2d2af94 100644
--- a/data/templates/pppoe/ip-pre-up.script.tmpl
+++ b/data/templates/pppoe/ip-pre-up.script.tmpl
@@ -2,7 +2,6 @@
 
 # As PPPoE is an "on demand" interface we need to re-configure it when it
 # becomes up
-
 if [ "$6" != "{{ intf }}" ]; then
     exit
 fi
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 %}
-- 
cgit v1.2.3