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, 41 insertions, 41 deletions

diff --git a/data/templates/pppoe/ipv6-up.script.tmpl b/data/templates/pppoe/ipv6-up.script.tmpl
index 037db66db..a4b08ddaf 100644
--- a/data/templates/pppoe/ipv6-up.script.tmpl
+++ b/data/templates/pppoe/ipv6-up.script.tmpl
@@ -1,41 +1,41 @@
-#!/bin/sh

-

-# As PPPoE is an "on demand" interface we need to re-configure it when it

-# becomes up

-

-if [ "$6" != "{{ intf }}" ]; then

-    exit

-fi

-

-{% if ipv6_autoconf -%}

-# add some info to syslog

-DIALER_PID=$(cat /var/run/{{ intf }}.pid)

-logger -t pppd[$DIALER_PID] "executing $0"

-logger -t pppd[$DIALER_PID] "configuring interface {{ intf }} via $2"

-

-# Configure interface-specific Host/Router behaviour.

-# Note: It is recommended to have the same setting on all interfaces; mixed

-# router/host scenarios are rather uncommon. Possible values are:

-#

-# 0  Forwarding disabled

-# 1  Forwarding enabled

-#

-echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/forwarding

-

-# Accept Router Advertisements; autoconfigure using them.

-#

-# It also determines whether or not to transmit Router

-# Solicitations. If and only if the functional setting is to

-# accept Router Advertisements, Router Solicitations will be

-# transmitted. Possible values are:

-#

-# 0  Do not accept Router Advertisements.

-# 1  Accept Router Advertisements if forwarding is disabled.

-# 2  Overrule forwarding behaviour. Accept Router Advertisements

-#    even if forwarding is enabled.

-#

-echo 2 > /proc/sys/net/ipv6/conf/{{ intf }}/accept_ra

-

-# Autoconfigure addresses using Prefix Information in Router Advertisements.

-echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/autoconfigure

-{% endif %}

+#!/bin/sh
+
+# As PPPoE is an "on demand" interface we need to re-configure it when it
+# becomes up
+
+if [ "$6" != "{{ intf }}" ]; then
+    exit
+fi
+
+{% if ipv6_autoconf -%}
+# add some info to syslog
+DIALER_PID=$(cat /var/run/{{ intf }}.pid)
+logger -t pppd[$DIALER_PID] "executing $0"
+logger -t pppd[$DIALER_PID] "configuring interface {{ intf }} via {{ source_interface }}"
+
+# Configure interface-specific Host/Router behaviour.
+# Note: It is recommended to have the same setting on all interfaces; mixed
+# router/host scenarios are rather uncommon. Possible values are:
+#
+# 0  Forwarding disabled
+# 1  Forwarding enabled
+#
+echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/forwarding
+
+# Accept Router Advertisements; autoconfigure using them.
+#
+# It also determines whether or not to transmit Router
+# Solicitations. If and only if the functional setting is to
+# accept Router Advertisements, Router Solicitations will be
+# transmitted. Possible values are:
+#
+# 0  Do not accept Router Advertisements.
+# 1  Accept Router Advertisements if forwarding is disabled.
+# 2  Overrule forwarding behaviour. Accept Router Advertisements
+#    even if forwarding is enabled.
+#
+echo 2 > /proc/sys/net/ipv6/conf/{{ intf }}/accept_ra
+
+# Autoconfigure addresses using Prefix Information in Router Advertisements.
+echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/autoconfigure
+{% endif %}