From 9ebef9e13c1bd3718b8fafabdfd78c33412b8722 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 4 Apr 2020 18:30:16 +0200
Subject: wwan: T2219: rework route add to VRF
The old implementation actually did not work as the Quotes "" around the
"vrf foo" statement got actually lost in translation.
---
data/templates/wwan/ip-up.script.tmpl | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
(limited to 'data')
diff --git a/data/templates/wwan/ip-up.script.tmpl b/data/templates/wwan/ip-up.script.tmpl
index 7382309ac..89e42a23a 100644
--- a/data/templates/wwan/ip-up.script.tmpl
+++ b/data/templates/wwan/ip-up.script.tmpl
@@ -7,6 +7,8 @@ if [ -z "$(echo $tty | egrep "tty(USB|ACM)")" ]; then
exit 0
fi
+DIALER_PID=$(cat /var/run/{{ intf }}.pid)
+
# Determine if we are enslaved to a VRF, this is needed to properly insert
# the default route
VRF_NAME=""
@@ -15,12 +17,9 @@ if [ -d /sys/class/net/{{ intf }}/upper_* ]; then
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=" -c vrf ${VRF_NAME} "
+ VRF_NAME="vrf ${VRF}"
fi
# Apply default route to either default or VRF routing table
-vtysh -c "conf t" ${VRF_NAME} -c "ip route 0.0.0.0/0 {{ intf }} {{ metric }}"
-
-DIALER_PID=$(cat /var/run/{{ intf }}.pid)
-logger -t pppd[$DIALER_PID] "added default route via {{ intf }} metric {{ metric }}"
+vtysh -c "conf t" -c "ip route 0.0.0.0/0 {{ intf }} ${VRF_NAME} {{ metric }}"
+logger -t pppd[$DIALER_PID] "added default route via {{ intf }} metric {{ metric }} ${VRF_NAME}"
--
cgit v1.2.3