freifunk-franken
/
firmware
9
7
Fork 13
Code Issues 48 Pull Requests 7 Releases 17 Wiki Activity

treewide: remove ETHPORT leftovers 

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 <fabian@blaese.de>
Tested-by: Sebastian Beck <freifunk@beibecks.de>
This commit is contained in:
Fabian Bläse 2022-03-22 22:26:09 +01:00
parent 240a506ee7
commit 0234203bed
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/packages/fff/fff-network/files/usr/sbin/configurenetwork
View File

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

2
src/packages/fff/fff-support/files/usr/sbin/show_info
View File

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

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

@ -151,7 +151,7 @@ format_port() {
</fieldset> </fieldset>
</td></tr> </td></tr>
<% fi %> <% 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 # Device has a port set by $ETHMODE
. /etc/network.mode . /etc/network.mode