From patchwork Wed Jul 19 20:51:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2] fff-network: Prevent resetting network config on each reboot From: Adrian Schmutzler X-Patchwork-Id: 387 Message-Id: <1500497480-46051-1-git-send-email-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Cc: Adrian Schmutzler Date: Wed, 19 Jul 2017 22:51:20 +0200 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 --- src/packages/fff/fff-network/files/usr/sbin/configurenetwork | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork index 63b216a..249227e 100755 --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork @@ -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 }') @@ -65,7 +65,7 @@ if ! uci get network.$SWITCHDEV.ifname; then /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