McUles
/
firmware
forked from freifunk-franken/firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fff-network: Prevent resetting network config on each reboot 

This only sets the switch configs if they are not set yet.
If the network.* file is edited, add FORCEPARSE=1 to apply
the changes.

Fixes #56

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Tobias Klaus <tk+ff@meskal.net>
This commit is contained in:
Adrian Schmutzler 2017-08-21 18:46:27 +02:00 committed by Tim Niemeyer
parent 21a585274e
commit b0974e0afc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@
BOARD="$(uci get board.model.name)"
. /etc/network.$BOARD
if ! uci get network.$SWITCHDEV.ifname; then
if ! uci -q get network.$SWITCHDEV > /dev/null || [ "$FORCEPARSE" = '1' ] ; then
SWITCHHW=$(swconfig list | awk '{ print $4 }')
@ -62,10 +62,9 @@ if ! uci get network.$SWITCHDEV.ifname; then
fi
uci commit
/etc/init.d/network restart
fi
if [ "$ONE_PORT" = "YES" ]; then
if [ "$ONE_PORT" = "YES" ] && ( ! uci -q get network.$SWITCHDEV.ifname || [ "$FORCEPARSE" = '1' ] ) ; then
uci set network.$SWITCHDEV=interface
uci set network.$SWITCHDEV.ifname=$SWITCHDEV
if [ "$ETHMODE" = "WAN" ]; then
@ -97,9 +96,10 @@ if [ "$ONE_PORT" = "YES" ]; then
ETH0MAC="w2ap"
fi
uci commit
/etc/init.d/network restart
fi
/etc/init.d/network restart
if [[ -n "$ETHMESHMAC" ]]; then
if uci get network.ethmesh.macaddr
then