pppoe: T2219: move adding of default route to ip-(up|down) script

As PPPoE interfaces should be part of a VRF it is required that the default
can also be set into the specified VRF. The default way of PPP by setting the
"defaultroute" option does not take a VRF into account. In this case PPP
installs a Kernel route forwarding all default traffic over this interface.

This change installs a static route with metric 1 instead into the routing
table via FRR. This is not the same as a Kernel route in terms of metric 1
compared to 0 but it should do the trick.

1 files changed, 63 insertions, 69 deletions

diff --git a/data/templates/pppoe/peer.tmpl b/data/templates/pppoe/peer.tmpl
index 029361101..8651f12a5 100644
--- a/data/templates/pppoe/peer.tmpl
+++ b/data/templates/pppoe/peer.tmpl
@@ -1,69 +1,63 @@
-### Autogenerated by interfaces-pppoe.py ###

-

-{% if description %}

-# {{ description }}

-{% endif %}

-

-# Require peer to provide the local IP address if it is not

-# specified explicitly in the config file.

-noipdefault

-

-# Don't show the password in logfiles:

-hide-password

-

-# Standard Link Control Protocol (LCP) parameters:

-lcp-echo-interval 20

-lcp-echo-failure 3

-

-# RFC 2516, paragraph 7 mandates that the following options MUST NOT be

-# requested and MUST be rejected if requested by the peer:

-# Address-and-Control-Field-Compression (ACFC)

-noaccomp

-

-# Asynchronous-Control-Character-Map (ACCM)

-default-asyncmap

-

-# Override any connect script that may have been set in /etc/ppp/options.

-connect /bin/true

-

-# Don't try to authenticate the remote node

-noauth

-

-# Don't try to proxy ARP for the remote endpoint. User can set proxy

-# arp entries up manually if they wish.  More importantly, having

-# the "proxyarp" parameter set disables the "defaultroute" option.

-noproxyarp

-

-# Unlimited connection attempts

-maxfail 0

-

-plugin rp-pppoe.so

-{{ source_interface }}

-persist

-ifname {{ intf }}

-ipparam {{ intf }}

-debug

-logfile {{ logfile }}

-{% if 'auto' in default_route -%}

-defaultroute

-{% elif 'force' in default_route -%}

-defaultroute

-replacedefaultroute

-{% endif %}

-mtu {{ mtu }}

-mru {{ mtu }}

-user "{{ auth_username }}"

-password "{{ auth_password }}"

-{% if name_server -%}

-usepeerdns

-{% endif %}

-{% if ipv6_enable -%}

-+ipv6

-ipv6cp-use-ipaddr

-{% endif %}

-{% if service_name -%}

-rp_pppoe_service "{{ service_name }}"

-{% endif %}

-{% if on_demand %}

-demand

-{% endif %}

+### Autogenerated by interfaces-pppoe.py ###
+
+{% if description %}
+# {{ description }}
+{% endif %}
+
+# Require peer to provide the local IP address if it is not
+# specified explicitly in the config file.
+noipdefault
+
+# Don't show the password in logfiles:
+hide-password
+
+# Standard Link Control Protocol (LCP) parameters:
+lcp-echo-interval 20
+lcp-echo-failure 3
+
+# RFC 2516, paragraph 7 mandates that the following options MUST NOT be
+# requested and MUST be rejected if requested by the peer:
+# Address-and-Control-Field-Compression (ACFC)
+noaccomp
+
+# Asynchronous-Control-Character-Map (ACCM)
+default-asyncmap
+
+# Override any connect script that may have been set in /etc/ppp/options.
+connect /bin/true
+
+# Don't try to authenticate the remote node
+noauth
+
+# Don't try to proxy ARP for the remote endpoint. User can set proxy
+# arp entries up manually if they wish.  More importantly, having
+# the "proxyarp" parameter set disables the "defaultroute" option.
+noproxyarp
+
+# Unlimited connection attempts
+maxfail 0
+
+plugin rp-pppoe.so
+{{ source_interface }}
+persist
+ifname {{ intf }}
+ipparam {{ intf }}
+debug
+logfile {{ logfile }}
+mtu {{ mtu }}
+mru {{ mtu }}
+user "{{ auth_username }}"
+password "{{ auth_password }}"
+{% if name_server -%}
+usepeerdns
+{% endif %}
+{% if ipv6_enable -%}
++ipv6
+ipv6cp-use-ipaddr
+{% endif %}
+{% if service_name -%}
+rp_pppoe_service "{{ service_name }}"
+{% endif %}
+{% if on_demand %}
+demand
+{% endif %}