src/packages/fff/fff-network/files/etc/uci-defaults/20-migrate-gl-ar150

@@ -0,0 +1,12 @@
+# The GL-AR150 was converted from ONEPORT to TWOPORT.
+# Copy ETHMODE to LAN1MODE ("LAN"-Port) and set LAN0MODE ("WAN"-Port) to WAN to retain the configured behaviour for upgraded devices.
+if [ -s /etc/network.config ] ; then
+	. /etc/network.config
+
+	# Ensure ETHMODE contains a sensible value. Use default behaviour (CLIENT) otherwise.
+	[ "$ETHMODE" != "BATMAN" ] && [ "$ETHMODE" != "CLIENT" ] && [ "$ETHMODE" != "WAN" ] && ETHMODE="CLIENT"
+
+	echo "LAN0MODE='WAN' # use BATMAN, CLIENT or WAN" > /etc/network.config
+	echo "LAN1MODE='$ETHMODE' # use BATMAN, CLIENT or WAN" >> /etc/network.config
+	echo "FORCEPARSE='2' # Parse at: 0=first boot only, 1=every reboot, 2=next reboot (once)" >> /etc/network.config
+fi

src/packages/fff/fff-network/files/usr/sbin/configurenetwork

@@ -11,7 +11,7 @@ if [ -s /etc/network.config ] ; then
     . /etc/network.config
 else
     # Write network.config
-    if [ "$ONE_PORT" = "YES" ] || [ -n "$ETHPORT" ] ; then
+    if [ "$ONE_PORT" = "YES" ] ; then
         echo "ETHMODE='$ETHMODE' # use BATMAN, CLIENT or WAN" >> /etc/network.config
     fi
     if [ -n "$TWO_PORT" ] ; then

src/packages/fff/fff-network/mips/network.glinet,gl-ar150

@@ -2,12 +2,8 @@
 
 WANDEV=eth1
 SWITCHDEV=eth0
-WAN_PORTS=
-BATMAN_PORTS="0t"
-CLIENT_PORTS="0t"
+TWO_PORT=YES
 
 ETHMESHMAC="$(macFlipLocalBit $(cat /sys/class/net/eth0/address))"
 
 . /etc/network.mode
-
-ETHPORT=1

src/packages/fff/fff-support/files/usr/sbin/show_info

@@ -221,7 +221,7 @@ if swconfig list | grep -q switch0 ; then
 	done
 else
 	echo "-> PORT ASSIGNMENT"
-	if grep -q "ONE_PORT" "/etc/network.$board_name" || grep -q "ETHPORT" "/etc/network.$board_name" ; then
+	if grep -q "ONE_PORT" "/etc/network.$board_name" ; then
 		# Device has a port set by $ETHMODE
 		. /etc/network.mode
 		. /etc/network.config

src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/ports.html

@@ -151,7 +151,7 @@ format_port() {
 	</fieldset>
 	</td></tr>
 <% fi %>
-<% if grep -q "ONE_PORT" "/etc/network.$board_name" || grep -q "ETHPORT" "/etc/network.$board_name" ; then %>
+<% if grep -q "ONE_PORT" "/etc/network.$board_name" ; then %>
 	<%
 		# Device has a port set by $ETHMODE
 		. /etc/network.mode