diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-10 13:28:46 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-10 13:31:18 +0200 |
| commit | 927c98f23a6317e2e3565032023d68b753d71037 (patch) | |
| tree | 771c8ac3d5c3ca09605cb3768fd1b71f0b03f4a9 /data/templates/pppoe/ip-down.script.tmpl | |
| parent | cbfc9156b37127c0c483ac744e7d168ad988419a (diff) | |
| download | vyos-1x-927c98f23a6317e2e3565032023d68b753d71037.tar.gz vyos-1x-927c98f23a6317e2e3565032023d68b753d71037.zip | |
pppoe: T2248: connect-on-demand and vrf are mutually exclusive
As PPP can be used to establish a connection on-demand it manages the Kernel
default route. This can not be used when using VRFs which are managed by
the ip-up.d and ip-down.d scripts - thus those options are now mutially
exclusive.
The best fix would be adding support for VRFs into PPP.
Diffstat (limited to 'data/templates/pppoe/ip-down.script.tmpl')
| -rw-r--r-- | data/templates/pppoe/ip-down.script.tmpl | 6 |
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 e76875f12..a68fc099c 100644 --- a/data/templates/pppoe/ip-down.script.tmpl +++ b/data/templates/pppoe/ip-down.script.tmpl @@ -10,8 +10,9 @@ fi DIALER_PID=$(cat /var/run/{{ intf }}.pid) logger -t pppd[$DIALER_PID] "executing $0" -# Determine if we are enslaved to a VRF, this is needed to properly insert -# the default route +{% if not on_demand %} +# See https://phabricator.vyos.net/T2248. 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 @@ -24,3 +25,4 @@ 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}" +{% endif %} |