From 0234203bede4b97bc98b81861fbdcdfab3d6b5ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Tue, 22 Mar 2022 22:26:09 +0100 Subject: [PATCH] treewide: remove ETHPORT leftovers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ETHPORT was used to configure devices with two physical ethernet ports, one of them being connected directly to the CPU, while the other one is connected to the internal switch of the platform. As the GL-AR150 has been converted to the TWO_PORT codepath and no other devices utilizes ETHPORT, remove all leftovers. Signed-off-by: Fabian Bläse Tested-by: Sebastian Beck --- src/packages/fff/fff-network/files/usr/sbin/configurenetwork | 2 +- src/packages/fff/fff-support/files/usr/sbin/show_info | 2 +- src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/ports.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork index 12f66893..ac91f841 100755 --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork +++ b/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 diff --git a/src/packages/fff/fff-support/files/usr/sbin/show_info b/src/packages/fff/fff-support/files/usr/sbin/show_info index 313b1315..9283ca16 100755 --- a/src/packages/fff/fff-support/files/usr/sbin/show_info +++ b/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 diff --git a/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/ports.html b/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/ports.html index 51d8ac33..f34d62fb 100755 --- a/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/ports.html +++ b/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/ports.html @@ -151,7 +151,7 @@ format_port() { <% 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