From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 21 Jun 2021 22:45:20 +0000 (+0200)
Subject: base-files: failsafe: Remove the VLAN modifier from interface name
X-Git-Tag: v21.02.0-rc4~60
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7a5a247c1fdea5e24e68958edade7747f065b066;p=openwrt%2Fstaging%2Fhauke.git

base-files: failsafe: Remove the VLAN modifier from interface name

Some interfaces have a VLAN modifier like :t in lan1:t, this modifier
should be removed from the interface before calling preinit_ip_config().

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 790561d5109ef81537fdb8ceb8eb183c0cab077c)
---

diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index 56e96c63ba..deb5f2ae3a 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -97,6 +97,8 @@ preinit_config_board() {
 	else
 		# trim any vlan ids
 		ifname=${ifname%\.*}
+		# trim any vlan modifiers like :t
+		ifname=${ifname%\:*}
 	fi
 
 	pi_ifname=$ifname