forked from freifunk-franken/firmware
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:
parent
21a585274e
commit
b0974e0afc
|
@ -12,7 +12,7 @@
|
||||||
BOARD="$(uci get board.model.name)"
|
BOARD="$(uci get board.model.name)"
|
||||||
. /etc/network.$BOARD
|
. /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 }')
|
SWITCHHW=$(swconfig list | awk '{ print $4 }')
|
||||||
|
|
||||||
|
@ -62,10 +62,9 @@ if ! uci get network.$SWITCHDEV.ifname; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
uci commit
|
uci commit
|
||||||
/etc/init.d/network restart
|
|
||||||
fi
|
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=interface
|
||||||
uci set network.$SWITCHDEV.ifname=$SWITCHDEV
|
uci set network.$SWITCHDEV.ifname=$SWITCHDEV
|
||||||
if [ "$ETHMODE" = "WAN" ]; then
|
if [ "$ETHMODE" = "WAN" ]; then
|
||||||
|
@ -97,9 +96,10 @@ if [ "$ONE_PORT" = "YES" ]; then
|
||||||
ETH0MAC="w2ap"
|
ETH0MAC="w2ap"
|
||||||
fi
|
fi
|
||||||
uci commit
|
uci commit
|
||||||
/etc/init.d/network restart
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
/etc/init.d/network restart
|
||||||
|
|
||||||
if [[ -n "$ETHMESHMAC" ]]; then
|
if [[ -n "$ETHMESHMAC" ]]; then
|
||||||
if uci get network.ethmesh.macaddr
|
if uci get network.ethmesh.macaddr
|
||||||
then
|
then
|
||||||
|
|
Loading…
Reference in New Issue