From 595de81dfff3a017d702d9ef3e7c1c926497a0d4 Mon Sep 17 00:00:00 2001
From: Sukru Senli <sukru.senli@inteno.se>
Date: Tue, 12 Apr 2016 18:24:03 +0200
Subject: [PATCH] layer2interface: for now populate network config ifnames
 along with layer2 configs

---
 .../etc/uci-defaults/20-layer2-config-generate     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate b/layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate
index 16fa5d547..dab9bb16f 100644
--- a/layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate
+++ b/layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate
@@ -4,6 +4,9 @@ local hasEthWan="1"
 local hasAdsl="$(db -q get hw.board.hasAdsl)"
 local hasVdsl="$(db -q get hw.board.hasVdsl)"
 
+local LANPORTS="$(db -q get hw.board.ethernetLanPorts)"
+local WANPORTS=""
+
 # populate layer2_interface_ethernet #
 if [ "$hasEthWan" == "1" ]; then
 	local wanEthernetPort="$(db -q get hw.board.ethernetWanPort)"
@@ -16,6 +19,8 @@ config ethernet_interface 'Wan'
 	option ifname '${wanEthernetPort}.1'
 EOF
 	fi
+	local ifname="$(uci -q get layer2_interface_ethernet.@ethernet_interface[0].ifname)"
+	[ -n "$WANPORTS" ] && WANPORTS="$WANPORTS $ifname" || WANPORTS="$ifname"
 elif [ "$hasEthWan" == "0" ]; then
 	echo "" > /etc/config/layer2_interface_ethernet
 fi
@@ -73,6 +78,8 @@ config atm_bridge
 	option 'atmtype' 'ubr'
 EOF
 	fi
+	local ifname="$(uci -q get layer2_interface_adsl.@atm_bridge[0].ifname)"
+	[ -n "$WANPORTS" ] && WANPORTS="$WANPORTS $ifname" || WANPORTS="$ifname"
 elif [ "$hasAdsl" == "0" ]; then
 	echo "" > /etc/config/layer2_interface_adsl
 fi
@@ -93,8 +100,15 @@ config vdsl_interface
 	option 'ipqos' '1'
 EOF
 	fi
+	local ifname="$(uci -q get layer2_interface_vdsl.@vdsl_interface[0].ifname)"
+	[ -n "$WANPORTS" ] && WANPORTS="$WANPORTS $ifname" || WANPORTS="$ifname"
 elif [ "$hasVdsl" == "0" ]; then
 	echo "" > /etc/config/layer2_interface_vdsl
 fi
 
+# populate network config ifnames #
+uci -q get network.lan.ifname >/dev/null || uci -q set network.lan.ifname="$LANPORTS"
+uci -q get network.wan.ifname >/dev/null || uci -q set network.wan.ifname="$WANPORTS"
+uci commit network
+
 sync