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

Convert GL-AR150 to TWO_PORT #224

Closed
fbl wants to merge 2 commits from fbl:ar150 into master
pull from: fbl:ar150
merge into: freifunk-franken:master
Conversation 8 Commits 2 Files Changed 5 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7c6a4f0acc - Show all commits

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