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/peer.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/peer.tmpl')
| -rw-r--r-- | data/templates/pppoe/peer.tmpl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/data/templates/pppoe/peer.tmpl b/data/templates/pppoe/peer.tmpl index 8651f12a5..36d108cee 100644 --- a/data/templates/pppoe/peer.tmpl +++ b/data/templates/pppoe/peer.tmpl @@ -60,4 +60,13 @@ rp_pppoe_service "{{ service_name }}" {% endif %} {% if on_demand %} demand +# See T2249. PPP default route options should only be set when in on-demand +# mode. As soon as we are not in on-demand mode the default-route handling is +# passed to the ip-up.d/ip-down.s scripts which is required for VRF support. +{% if 'auto' in default_route -%} +defaultroute +{% elif 'force' in default_route -%} +defaultroute +replacedefaultroute +{% endif %} {% endif %} |