[PATCH v2 2/2] fff-network: Calculate IPv6 using ROUTERMAC variable

[Tim Niemeyer]

Am Mittwoch, den 03.01.2018, 00:37 +0100 schrieb Adrian Schmutzler:
> If the mac is read from /sys/class/net/${iface}/address, some
> devices (WA860RE, Picostation) will not set the fdff addresses.
> 
> This can be fixed by using the $ROUTERMAC in configurenetwork.

Damit änderst du das Verhalten der network.xxxx Files. Immerhin ist es
dann jetzt ab sofort _Pflicht_ dieses Feld ROUTERMAC auszufüllen.

Ansonsten:
Reviewed und applied.

Tim

> 
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> 
> Tested-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> 
> ---
> 
> This replaces the older patch:
> fff-network/fff-hoods: Calculate fdff IPs based on uci
> ---
>  src/packages/fff/fff-network/files/usr/sbin/configurenetwork | 5 ++-
> --
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/src/packages/fff/fff-
> network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-
> network/files/usr/sbin/configurenetwork
> index ac17514..acb2b21 100755
> --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
> +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
> @@ -166,8 +166,7 @@ else
>  
>      prefix="fdff:0::/64"
>      # Set $prefix::MAC as IP
> -    mac="$(cat "/sys/class/net/br-mesh/address")"
> -    addr="$(ipMacAssemble "$prefix" "$mac")"
> +    addr="$(ipMacAssemble "$prefix" "$ROUTERMAC")"
>      ip -6 addr add $addr dev br-mesh
>  
>      uci -q del network.globals
> @@ -182,7 +181,7 @@ else
>      uci -q add_list network.mesh.ip6addr=$addr
>  
>      # Set $prefix::link-local as IP
> -    addr="$(ipEUIAssemble "$prefix" "$mac")"
> +    addr="$(ipEUIAssemble "$prefix" "$ROUTERMAC")"
>      ip -6 addr add $addr dev br-mesh
>      uci -q add_list network.mesh.ip6addr=$addr
>  
> -- 
> 2.7.4
> 
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 488 bytes
Beschreibung: This is a digitally signed message part
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20180120/14a29529/attachment.sig>