From: Sungbo Eo <mans0n@gorani.run>
Date: Fri, 29 May 2020 11:51:01 +0000 (+0900)
Subject: mediatek: do not create device nodes in uci-defaults script
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=923792369e2befc2ebda6bbadc3e9a3c314e2c25;p=openwrt%2Fstaging%2Flinusw.git

mediatek: do not create device nodes in uci-defaults script

Since commit 298814e6be76 ("base-files: config_generate: split macaddr with
multiple ifaces") uci MAC address setup will create a device node for each
member iface. But this script might override the device nodes and interfere
with the MAC address setup.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
---

diff --git a/target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps b/target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps
index 596b33c5b4..15e9ef32a3 100755
--- a/target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps
+++ b/target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps
@@ -1,16 +1,5 @@
-uci set network.globals='globals'
-uci set network.globals.packet_steering=1
-uci set network.eth0=device
-uci set network.eth0.name=eth0
-uci set network.lan0=device
-uci set network.lan0.name=lan0
-uci set network.lan1=device
-uci set network.lan1.name=lan1
-uci set network.lan2=device
-uci set network.lan2.name=lan2
-uci set network.lan3=device
-uci set network.lan3.name=lan3
-
-uci commit network
-
-exit 0
+uci -q get network.globals.packet_steering >/dev/null || {
+	uci set network.globals='globals'
+	uci set network.globals.packet_steering=1
+	uci commit network
+}