From patchwork Fri Nov 3 14:59:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: fff-network: evaluate macaddress in device config From: Fabian Blaese X-Patchwork-Id: 660 Message-Id: <20171103145918.8555-1-fabian@blaese.de> To: franken-dev@freifunk.net Date: Fri, 3 Nov 2017 15:59:18 +0100 This allows for more latitude when evaluating the addresses needed for br-mesh and ethmesh. Signed-off-by: Fabian Bläse Reviewed-by: Tim Niemeyer Tested-by: Fabian Bläse Reviewed-by: Adrian Schmutzler --- src/packages/fff/fff-network/ar71xx/network.archer-c25-v1 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.cpe210 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.cpe510 | 2 +- src/packages/fff/fff-network/ar71xx/network.gl-ar150 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 | 3 +-- src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 | 3 +-- src/packages/fff/fff-network/ar71xx/network.tl-wa901nd-v2 | 3 +-- src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1 | 3 +-- src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 | 3 +-- src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 | 3 +-- src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 | 3 +-- src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2 | 3 +-- src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3 | 3 +-- src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 | 5 ++--- src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2 | 4 ++-- src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m | 3 +-- src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw | 3 +-- src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m | 3 +-- src/packages/fff/fff-network/ar71xx/network.ubnt-unifi | 3 +-- .../fff/fff-network/files/usr/sbin/configurenetwork | 14 ++++++-------- src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1 | 4 ++-- 32 files changed, 54 insertions(+), 70 deletions(-) diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1 b/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1 index e524545..fcea7f1 100644 --- a/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1 @@ -4,5 +4,5 @@ CLIENT_PORTS="1 2 0t" WAN_PORTS="" BATMAN_PORTS="3 4 0t" -ETHMESHMAC=eth1 -ROUTERMAC=eth0 +ETHMESHMAC=$(cat /sys/class/net/eth1/address) +ROUTERMAC=$(cat /sys/class/net/eth0/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 index ff5ca44..593bc2a 100644 --- a/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 @@ -4,5 +4,5 @@ CLIENT_PORTS="4 5 0t" WAN_PORTS="1 6" BATMAN_PORTS="2 3 0t" -ETHMESHMAC=eth0 -ROUTERMAC=eth1 +ETHMESHMAC=$(cat /sys/class/net/eth0/address) +ROUTERMAC=$(cat /sys/class/net/eth1/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.cpe210 b/src/packages/fff/fff-network/ar71xx/network.cpe210 index 97269e5..dab61c7 100644 --- a/src/packages/fff/fff-network/ar71xx/network.cpe210 +++ b/src/packages/fff/fff-network/ar71xx/network.cpe210 @@ -4,8 +4,8 @@ CLIENT_PORTS="0t" WAN_PORTS="0t" BATMAN_PORTS="0t" -ROUTERMAC="eth0" -ETHMESHMAC="w2ap" +ROUTERMAC=$(cat /sys/class/net/eth0/address) +ETHMESHMAC=$(cat /sys/class/net/w2ap/address) . /etc/network.mode diff --git a/src/packages/fff/fff-network/ar71xx/network.cpe510 b/src/packages/fff/fff-network/ar71xx/network.cpe510 index 6764c64..7bca180 100644 --- a/src/packages/fff/fff-network/ar71xx/network.cpe510 +++ b/src/packages/fff/fff-network/ar71xx/network.cpe510 @@ -4,7 +4,7 @@ CLIENT_PORTS="0t" WAN_PORTS="0t" BATMAN_PORTS="0t" -ETHMESHMAC="w2ap" +ETHMESHMAC=$(cat /sys/class/net/w2ap/address) . /etc/network.mode diff --git a/src/packages/fff/fff-network/ar71xx/network.gl-ar150 b/src/packages/fff/fff-network/ar71xx/network.gl-ar150 index 61ce71a..060c397 100644 --- a/src/packages/fff/fff-network/ar71xx/network.gl-ar150 +++ b/src/packages/fff/fff-network/ar71xx/network.gl-ar150 @@ -4,8 +4,8 @@ WAN_PORTS= BATMAN_PORTS="0t" CLIENT_PORTS="0t" -ETHMESHMAC=eth1 -ROUTERMAC=eth0 +ETHMESHMAC=$(cat /sys/class/net/eth1/address) +ROUTERMAC=$(cat /sys/class/net/eth0/address) . /etc/network.mode diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1 index 62f456a..facaf91 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1 @@ -7,5 +7,5 @@ ONE_PORT="YES" . /etc/network.mode -ETHMESHMAC=eth0 -ROUTERMAC=eth0 \ No newline at end of file +ETHMESHMAC=$(cat /sys/class/net/eth0/address) +ROUTERMAC=$(cat /sys/class/net/eth0/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 index 307a201..7c342a6 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 @@ -7,5 +7,4 @@ ONE_PORT="YES" . /etc/network.mode -ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=$(cat /sys/class/net/w2mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 index 307a201..7c342a6 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 @@ -7,5 +7,4 @@ ONE_PORT="YES" . /etc/network.mode -ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=$(cat /sys/class/net/w2mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wa901nd-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wa901nd-v2 index 307a201..7c342a6 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wa901nd-v2 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wa901nd-v2 @@ -7,5 +7,4 @@ ONE_PORT="YES" . /etc/network.mode -ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=$(cat /sys/class/net/w2mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1 index 3d0e901..e859a9b 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1 @@ -4,5 +4,4 @@ CLIENT_PORTS="0t 1 2" WAN_PORTS= BATMAN_PORTS="0t 3 4" -ETHMESHMAC= -ROUTERMAC=w2mesh +ROUTERMAC=$(cat /sys/class/net/w2mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 index 897152e..1ba9c24 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 @@ -4,5 +4,4 @@ CLIENT_PORTS="0t 4 5" WAN_PORTS="0t 1" BATMAN_PORTS="0t 2 3" -ETHMESHMAC= -ROUTERMAC=w5mesh +ROUTERMAC=$(cat /sys/class/net/w5mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 index 897152e..1ba9c24 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 @@ -4,5 +4,4 @@ CLIENT_PORTS="0t 4 5" WAN_PORTS="0t 1" BATMAN_PORTS="0t 2 3" -ETHMESHMAC= -ROUTERMAC=w5mesh +ROUTERMAC=$(cat /sys/class/net/w5mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 index 897152e..1ba9c24 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 @@ -4,5 +4,4 @@ CLIENT_PORTS="0t 4 5" WAN_PORTS="0t 1" BATMAN_PORTS="0t 2 3" -ETHMESHMAC= -ROUTERMAC=w5mesh +ROUTERMAC=$(cat /sys/class/net/w5mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1 index a3ea6c3..12f49e2 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1 @@ -4,5 +4,5 @@ CLIENT_PORTS="3 4 5t" WAN_PORTS="0 5t" BATMAN_PORTS="1 2 5t" -ETHMESHMAC=w2ap -ROUTERMAC=eth0 +ETHMESHMAC=$(cat /sys/class/net/w2ap/address) +ROUTERMAC=$(cat /sys/class/net/eth0/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2 index 6dd4674..2ce83e6 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2 @@ -4,5 +4,4 @@ CLIENT_PORTS="1 2 6t" WAN_PORTS="5 6t" BATMAN_PORTS="3 4 6t" -ETHMESHMAC= -ROUTERMAC=eth1 +ROUTERMAC=$(cat /sys/class/net/eth1/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3 index 6dd4674..2ce83e6 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3 @@ -4,5 +4,4 @@ CLIENT_PORTS="1 2 6t" WAN_PORTS="5 6t" BATMAN_PORTS="3 4 6t" -ETHMESHMAC= -ROUTERMAC=eth1 +ROUTERMAC=$(cat /sys/class/net/eth1/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 index 93772f9..db35453 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 @@ -11,6 +11,5 @@ BATMAN_PORTS="3 4 0t" # Load second MAC from Flash because we haven't any Interface with this MAC where we can copy the MAC from # https://github.com/lede-project/source/pull/613/files#diff-abd6f42f54204372151e73eac0556db1 -NEWMAC=$(mtd_get_mac_binary config 0x1017c) -ETHMESHMAC=1 -ROUTERMAC=eth0 +ETHMESHMAC=$(mtd_get_mac_binary config 0x1017c) +ROUTERMAC=$(cat /sys/class/net/eth0/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4 index fbe5744..114ba49 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4 @@ -5,5 +5,5 @@ CLIENT_PORTS="1 4 0t" WAN_PORTS= BATMAN_PORTS="2 3 0t" -ETHMESHMAC=eth1 -ROUTERMAC=w2mesh +ETHMESHMAC=$(cat /sys/class/net/eth1/address) +ROUTERMAC=$(cat /sys/class/net/w2mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2 index 85abc31..5f2300d 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2 @@ -5,5 +5,5 @@ CLIENT_PORTS="1 2 0t" WAN_PORTS= BATMAN_PORTS="3 4 0t" -ETHMESHMAC=eth1 -ROUTERMAC=w2mesh +ETHMESHMAC=$(cat /sys/class/net/eth1/address) +ROUTERMAC=$(cat /sys/class/net/w2mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4 index fbe5744..114ba49 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4 @@ -5,5 +5,5 @@ CLIENT_PORTS="1 4 0t" WAN_PORTS= BATMAN_PORTS="2 3 0t" -ETHMESHMAC=eth1 -ROUTERMAC=w2mesh +ETHMESHMAC=$(cat /sys/class/net/eth1/address) +ROUTERMAC=$(cat /sys/class/net/w2mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10 index 1d3f146..498708b 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10 @@ -4,5 +4,5 @@ CLIENT_PORTS="1 2 0t" WAN_PORTS= BATMAN_PORTS="3 4 0t" -ETHMESHMAC=eth1 -ROUTERMAC=eth0 +ETHMESHMAC=$(cat /sys/class/net/eth1/address) +ROUTERMAC=$(cat /sys/class/net/eth0/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11 index 1d3f146..498708b 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11 @@ -4,5 +4,5 @@ CLIENT_PORTS="1 2 0t" WAN_PORTS= BATMAN_PORTS="3 4 0t" -ETHMESHMAC=eth1 -ROUTERMAC=eth0 +ETHMESHMAC=$(cat /sys/class/net/eth1/address) +ROUTERMAC=$(cat /sys/class/net/eth0/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8 index c0e3817..6e03131 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8 @@ -4,5 +4,5 @@ CLIENT_PORTS="1 4 0t" WAN_PORTS= BATMAN_PORTS="3 2 0t" -ETHMESHMAC=eth0 -ROUTERMAC=eth1 +ETHMESHMAC=$(cat /sys/class/net/eth0/address) +ROUTERMAC=$(cat /sys/class/net/eth1/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9 index 1d3f146..498708b 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9 @@ -4,5 +4,5 @@ CLIENT_PORTS="1 2 0t" WAN_PORTS= BATMAN_PORTS="3 4 0t" -ETHMESHMAC=eth1 -ROUTERMAC=eth0 +ETHMESHMAC=$(cat /sys/class/net/eth1/address) +ROUTERMAC=$(cat /sys/class/net/eth0/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7 index 7a56a98..183e123 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7 @@ -4,5 +4,5 @@ CLIENT_PORTS="1 2 0t" WAN_PORTS= BATMAN_PORTS="3 4 0t" -ETHMESHMAC=eth1 -ROUTERMAC=wlan0 +ETHMESHMAC=$(cat /sys/class/net/eth1/address) +ROUTERMAC=$(cat /sys/class/net/wlan0/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2 index c0e3817..6e03131 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2 @@ -4,5 +4,5 @@ CLIENT_PORTS="1 4 0t" WAN_PORTS= BATMAN_PORTS="3 2 0t" -ETHMESHMAC=eth0 -ROUTERMAC=eth1 +ETHMESHMAC=$(cat /sys/class/net/eth0/address) +ROUTERMAC=$(cat /sys/class/net/eth1/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m b/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m index 307a201..7c342a6 100644 --- a/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m @@ -7,5 +7,4 @@ ONE_PORT="YES" . /etc/network.mode -ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=$(cat /sys/class/net/w2mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw b/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw index 307a201..7c342a6 100644 --- a/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw @@ -7,5 +7,4 @@ ONE_PORT="YES" . /etc/network.mode -ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=$(cat /sys/class/net/w2mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m b/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m index 307a201..7c342a6 100644 --- a/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m @@ -7,5 +7,4 @@ ONE_PORT="YES" . /etc/network.mode -ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=$(cat /sys/class/net/w2mesh/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-unifi b/src/packages/fff/fff-network/ar71xx/network.ubnt-unifi index 307a201..7c342a6 100644 --- a/src/packages/fff/fff-network/ar71xx/network.ubnt-unifi +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-unifi @@ -7,5 +7,4 @@ ONE_PORT="YES" . /etc/network.mode -ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=$(cat /sys/class/net/w2mesh/address) diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork index d4866e4..a60a5bf 100755 --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork @@ -164,13 +164,10 @@ if [[ -n "$ETHMESHMAC" ]]; then else echo "Fixing MAC on eth0.3 (ethmesh)" sleep 10 - NEW_MACADDR=$(cat /sys/class/net/$ETHMESHMAC/address) - # We need this to set the second MAC for the wr1043 v4 from a variable and not from an Interface - if [[ -n "$NEWMAC" ]]; then - NEW_MACADDR=$NEWMAC - fi - uci set network.ethmesh.macaddr=$NEW_MACADDR + + uci set network.ethmesh.macaddr=$ETHMESHMAC uci commit + ifconfig eth0.3 down ifconfig eth0.3 hw ether $NEW_MACADDR ifconfig eth0.3 up @@ -185,9 +182,10 @@ if [[ -n "$ROUTERMAC" ]]; then else echo "Fixing MAC on br-mesh (mesh)" sleep 10 - NEW_MACADDR=$(cat /sys/class/net/$ROUTERMAC/address) - uci set network.mesh.macaddr=$NEW_MACADDR + + uci set network.mesh.macaddr=$ROUTERMAC uci commit + ifconfig br-mesh down ifconfig br-mesh hw ether $NEW_MACADDR ifconfig br-mesh up diff --git a/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1 b/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1 index 897152e..d293f06 100644 --- a/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1 +++ b/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1 @@ -4,5 +4,5 @@ CLIENT_PORTS="0t 4 5" WAN_PORTS="0t 1" BATMAN_PORTS="0t 2 3" -ETHMESHMAC= -ROUTERMAC=w5mesh +ETHMESHMAC=$(cat /sys/class/net/w2ap/address) +ROUTERMAC=$(cat /sys/class/net/eth0/address)