From fafeaf75027135e99aa4cd28b7e37e176ef6b4c3 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 17 Jan 2025 11:02:51 +0100
Subject: [PATCH] Force lan interface device on initial config

---
 openmptcprouter/files/etc/uci-defaults/1920-omr-network | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/openmptcprouter/files/etc/uci-defaults/1920-omr-network b/openmptcprouter/files/etc/uci-defaults/1920-omr-network
index be8759eeb..36ffd02e5 100755
--- a/openmptcprouter/files/etc/uci-defaults/1920-omr-network
+++ b/openmptcprouter/files/etc/uci-defaults/1920-omr-network
@@ -65,6 +65,7 @@ _setup_wan_interface() {
 	set network.$1.defaultroute=0
 	set network.$1.delegate=0
 	set network.$1.addlatency=0
+	delete network.$1.ifname
 	set network.${1}_dev=device
 	set network.${1}_dev.name=$2
 	set network.${1}_dev.txqueuelen=1000
@@ -195,6 +196,9 @@ set network.lan.delegate=0
 set network.lan.addlatency=0
 set network.lan.txqueuelen=2000
 set dhcp.lan.dhcpv4='server'
+set network.lan_dev=device
+set network.lan_dev.name=${lanif}
+
 EOF
 
 uci -q batch <<-EOF
@@ -291,6 +295,11 @@ if [ "$(uci -q show network.wan1 | grep multipath)" = "" ] && [ -z "$(uci -q get
 					_setup_wan_interface wan4 lan4 on
 					_macaddr=$(uci -q get "network.lan4.macaddr")
 					_setup_macaddr "wan4" "${_macaddr:-$(dd if=/dev/urandom bs=1024 count=1 2>/dev/null | md5sum | sed -e 's/^\(..\)\(..\)\(..\)\(..\)\(..\)\(..\).*$/\1:\2:\3:\4:\5:\6/' -e 's/^\(.\)[13579bdf]/\10/')}"
+					if [ -d /sys/class/net/lan5 ] || [ -n "$(ip link | grep ' lan5')" ]; then
+						_setup_wan_interface wan5 lan5 on
+						_macaddr=$(uci -q get "network.lan5.macaddr")
+						_setup_macaddr "wan5" "${_macaddr:-$(dd if=/dev/urandom bs=1024 count=1 2>/dev/null | md5sum | sed -e 's/^\(..\)\(..\)\(..\)\(..\)\(..\)\(..\).*$/\1:\2:\3:\4:\5:\6/' -e 's/^\(.\)[13579bdf]/\10/')}"
+					fi
 				fi
 			fi
 		else