diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-04-04 18:52:15 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-04-04 18:52:15 +0200 |
commit | 6e0e210920de7984ec4e655cd679ab8c66dfebe5 (patch) | |
tree | cd173edbcf8a32ffe15280a5e0664319303a3f23 /data/templates/pppoe/ip-down.script.tmpl | |
parent | 9ebef9e13c1bd3718b8fafabdfd78c33412b8722 (diff) | |
download | vyos-1x-6e0e210920de7984ec4e655cd679ab8c66dfebe5.tar.gz vyos-1x-6e0e210920de7984ec4e655cd679ab8c66dfebe5.zip |
pppoe: T2219: support adding default route to VRF
Diffstat (limited to 'data/templates/pppoe/ip-down.script.tmpl')
-rw-r--r-- | data/templates/pppoe/ip-down.script.tmpl | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/data/templates/pppoe/ip-down.script.tmpl b/data/templates/pppoe/ip-down.script.tmpl index f90da02bc..e76875f12 100644 --- a/data/templates/pppoe/ip-down.script.tmpl +++ b/data/templates/pppoe/ip-down.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 @@ -11,6 +10,17 @@ fi DIALER_PID=$(cat /var/run/{{ intf }}.pid) logger -t pppd[$DIALER_PID] "executing $0" -# Debian PPP version has no support for replacing an existing default route -# thus we emulate this ba an ip-up script https://phabricator.vyos.net/T2220. -vtysh -c "conf t" -c "no ip route 0.0.0.0/0 {{ intf }}" +# Determine if we are enslaved to a VRF, this is needed to properly insert +# the default route +VRF_NAME="" +if [ -d /sys/class/net/{{ intf }}/upper_* ]; then + # Determine upper (VRF) interface + VRF=$(basename $(ls -d /sys/class/net/{{ intf }}/upper_*)) + # Remove upper_ prefix from result string + VRF=${VRF#"upper_"} + # Populate variable to run in VR context + VRF_NAME="vrf ${VRF_NAME}" +fi + +# Always delete default route when interface goes down +vtysh -c "conf t" ${VRF_NAME} -c "no ip route 0.0.0.0/0 {{ intf }} ${VRF_NAME}" |