[PATCH] fff-network: Commit only network
Fabian Bläse
fabian at blaese.de
Fr Dez 1 10:46:46 CET 2017
Müsste soweit passen.
Reviewed-by: Fabian Bläse <fabian at blaese.de>
Fabian
> On 23. Nov 2017, at 21:26, Adrian Schmutzler <freifunk at adrianschmutzler.de> wrote:
>
> Since we change only the network part of uci, we only need to
> commit this part and not the whole config five times.
>
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> ---
> src/packages/fff/fff-network/files/usr/sbin/configurenetwork | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
> index 8ff91b4..c84e3ba 100755
> --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
> +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
> @@ -118,7 +118,7 @@ if ! uci -q get network.$SWITCHDEV > /dev/null || [ "$FORCEPARSE" = '1' ] ; then
> uci set network.wan.ifname=$WANDEV
> fi
>
> - uci commit
> + uci commit network
> fi
>
> if [ "$ONE_PORT" = "YES" ] && ( ! uci -q get network.$SWITCHDEV.ifname || [ "$FORCEPARSE" = '1' ] ) ; then
> @@ -152,7 +152,7 @@ if [ "$ONE_PORT" = "YES" ] && ( ! uci -q get network.$SWITCHDEV.ifname || [ "$FO
> uci set network.ethmesh.ifname="$SWITCHDEV"
> ETH0MAC=1
> fi
> - uci commit
> + uci commit network
> fi
>
> /etc/init.d/network restart
> @@ -166,7 +166,7 @@ if [[ -n "$ETHMESHMAC" ]]; then
> sleep 10
>
> uci set network.ethmesh.macaddr=$ETHMESHMAC
> - uci commit
> + uci commit network
>
> ifconfig $SWITCHDEV.3 down
> ifconfig $SWITCHDEV.3 hw ether $ETHMESHMAC
> @@ -184,7 +184,7 @@ if [[ -n "$ROUTERMAC" ]]; then
> sleep 10
>
> uci set network.mesh.macaddr=$ROUTERMAC
> - uci commit
> + uci commit network
>
> ifconfig br-mesh down
> ifconfig br-mesh hw ether $ROUTERMAC
> @@ -198,7 +198,7 @@ if [[ -n "$ETH0MAC" ]]; then
> sleep 10
> NEW_MACADDR=$(macFlipLocalBit "$ROUTERMAC")
> uci set network.eth0.macaddr=$NEW_MACADDR
> - uci commit
> + uci commit network
> ifconfig eth0 down
> ifconfig eth0 hw ether $NEW_MACADDR
> ifconfig eth0 up
> --
> 2.7.4
>
> --
> franken-dev mailing list
> franken-dev at freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname : signature.asc
Dateityp : application/pgp-signature
Dateigröße : 833 bytes
Beschreibung: Message signed with OpenPGP
URL : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20171201/1b72f7c8/attachment.sig>
Mehr Informationen über die Mailingliste franken-dev