<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<p><br>
</p>
<div class="moz-cite-prefix">Am 06.11.18 um 13:28 schrieb Adrian
Schmutzler:<br>
</div>
<blockquote type="cite"
cite="mid:000801d475cc$378ccea0$a6a66be0$@adrianschmutzler.de">
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<meta name="Generator" content="Microsoft Word 15 (filtered
medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p
{mso-style-priority:99;
mso-margin-top-alt:auto;
margin-right:0cm;
mso-margin-bottom-alt:auto;
margin-left:0cm;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
span.EmailStyle18
{mso-style-type:personal;
font-family:"Calibri",sans-serif;
color:#1F497D;}
span.EmailStyle19
{mso-style-type:personal-compose;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:70.85pt 70.85pt 2.0cm 70.85pt;}
div.WordSection1
{page:WordSection1;}
--></style>
<div class="WordSection1">
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US">Hallo
robert,<o:p></o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US">alles
klar, ich lasse mich sowohl für eine Aufräumaktion zwecks
ifconfig als auch für eine zwecks Variablennamen begeistert.<o:p></o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US">Zwecks
–z:<o:p></o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US">Ich
gehe davon aus, das die Negation auch mit einer nicht
gesetzten Variable klappt, wenn man diese in
Anführungszeichen schreibt:<o:p></o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US">[
-z „$a“ ] ergibt wahrscheinlich genau das Gleiche wie [ ! -n
„$a“ ] .</span></p>
</div>
</blockquote>
<p>ja, das ist egal. Mir ist nur ein seltsamer Effekt aufgefallen:<br>
root@c2600:~# set | tail -1<br>
var=''<br>
root@c2600:~# [ -n $var ] && echo true<br>
true<br>
root@c2600:~# [ -n "$var" ] && echo true<br>
root@c2600:~#</p>
<p>Das ist hinterhaeltig. Muss man aufpassen. War mir auch nicht
klar. Bin bis jetzt davon ausgegangen, das sollte gleich sein.<br>
</p>
<p>-z macht das nicht</p>
<p>root@c2600:~# [ -z "$var" ] && echo true<br>
true<br>
root@c2600:~# [ -z $var ] && echo true<br>
true<br>
root@c2600:~# <br>
</p>
<p>Robert<br>
</p>
<blockquote type="cite"
cite="mid:000801d475cc$378ccea0$a6a66be0$@adrianschmutzler.de">
<div class="WordSection1">
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p></o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p><br>
</o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US">Ich
bin mir nur nicht zu 100 % sicher. Soll ich das beim Applien
noch auf -z ändern?</span></p>
</div>
</blockquote>
<blockquote type="cite"
cite="mid:000801d475cc$378ccea0$a6a66be0$@adrianschmutzler.de">
<div class="WordSection1">
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p></o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US">Grüße<o:p></o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US">Adrian<o:p></o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0cm
0cm 0cm 4.0pt">
<div>
<div style="border:none;border-top:solid #E1E1E1
1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif"
lang="EN-US">From:</span></b><span
style="font-size:11.0pt;font-family:"Calibri",sans-serif"
lang="EN-US"> franken-dev
[<a class="moz-txt-link-freetext" href="mailto:franken-dev-bounces@freifunk.net">mailto:franken-dev-bounces@freifunk.net</a>] <b>On
Behalf Of </b>robert<br>
<b>Sent:</b> Dienstag, 6. November 2018 12:49<br>
<b>To:</b> <a class="moz-txt-link-abbreviated" href="mailto:franken-dev@freifunk.net">franken-dev@freifunk.net</a><br>
<b>Subject:</b> Re: [PATCH v5 1/2] fff-network:
Introduce function to set MAC on device<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p><span style="font-family:"Calibri",sans-serif">Dann
schreiben wir uns doch eine Aufräumaktion auf die todo
Liste und</span> <br>
<span style="font-family:"Calibri",sans-serif">machen
erst mal die Patches fertig. Den 2/2 schau ich mir spaeter
in</span> <br>
<span style="font-family:"Calibri",sans-serif">Ruhe
an, was der macht.</span> <o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">Hier
ein</span> <o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">Reviewed-by:
Robert Langhammer <<a href="mailto:rlanghammer@web.de"
moz-do-not-send="true">rlanghammer@web.de</a>></span>
<o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">Am
06.11.18 um 11:55 schrieb <a
href="mailto:mail@adrianschmutzler.de"
moz-do-not-send="true">mail@adrianschmutzler.de</a>:</span>
<br>
<span style="font-family:"Calibri",sans-serif">>
Hallo Robert,</span> <br>
<span style="font-family:"Calibri",sans-serif">></span>
<br>
<span style="font-family:"Calibri",sans-serif">>
danke für die Rückmeldung.</span> <br>
<span style="font-family:"Calibri",sans-serif">></span>
<br>
<span style="font-family:"Calibri",sans-serif">>
Das mit dem ip statt ifconfig teile ich, allerdings würde
ich das gerne in einen separaten Patch bauen und nach dem
Release machen, falls es unvorhergesehenes Verhalten durch
den Austausch gibt. (Die jetzige Variante läuft schon sehr
lange bei mir, daher habe ich da mehr Vertrauen.</span><o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">></span>
<br>
<span style="font-family:"Calibri",sans-serif">>
Die Verneinung von -n hatte den Hintergrund, dass dann
eine nicht gesetzte (!) Variable wie eine leere behandelt
wird. Ist das dann auch bei -z so?</span><o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">Das
mit der leeren Variable musste ich noch mal testen. Es ist
so, dass</span> <br>
<span style="font-family:"Calibri",sans-serif">es
keinen Unterschied macht:</span> <o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">Eine
leere aber vorhandene</span> <o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">root@c2600:~#
var=</span> <br>
<span style="font-family:"Calibri",sans-serif">root@c2600:~#
set | tail -2</span> <br>
<span style="font-family:"Calibri",sans-serif">_='FILE'</span>
<br>
<span style="font-family:"Calibri",sans-serif">var=''</span>
<br>
<span style="font-family:"Calibri",sans-serif">root@c2600:~#
[ $var ] && echo ja</span> <br>
<span style="font-family:"Calibri",sans-serif">root@c2600:~#
[ -z $var ] && echo ja</span> <br>
<span style="font-family:"Calibri",sans-serif">ja</span>
<br>
<span style="font-family:"Calibri",sans-serif">root@c2600:~#
[ ! -n $var ] && echo ja</span> <br>
<span style="font-family:"Calibri",sans-serif">root@c2600:~#
[ ! $var ] && echo ja</span> <br>
<span style="font-family:"Calibri",sans-serif">ja</span>
<o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">und
eine nicht vorhandene:</span> <o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">root@c2600:~#
[ $ldfghs ] && echo ja</span> <br>
<span style="font-family:"Calibri",sans-serif">root@c2600:~#</span>
<br>
<span style="font-family:"Calibri",sans-serif">root@c2600:~#
[ -z $ldfghs ] && echo ja</span> <br>
<span style="font-family:"Calibri",sans-serif">ja</span>
<br>
<span style="font-family:"Calibri",sans-serif">root@c2600:~#</span>
<o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">-z
stimmte nicht, war mein Dekfehler.</span> <o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">></span>
<br>
<span style="font-family:"Calibri",sans-serif">>
Zwecks der {} habe ich das auch eher gemischt gemacht, und
immer wenn ich mir nicht sicher war habe ich
sicherheitshalber welche hingemacht.</span><o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">></span>
<br>
<span style="font-family:"Calibri",sans-serif">>
In irgendeiner Sprache hatte ich da mal ein Problem, dass
dann die Variablen nicht aufgelöst werden konnten, wenn
das falsche dahinter stand.</span><o:p></o:p></p>
<p><span style="font-family:"Calibri",sans-serif">></span>
<br>
<span style="font-family:"Calibri",sans-serif">>
Könnte man aber gerne irgendwie vereinheitlichen.</span> <br>
<span style="font-family:"Calibri",sans-serif">></span>
<br>
<span style="font-family:"Calibri",sans-serif">>
Grüße</span> <br>
<span style="font-family:"Calibri",sans-serif">></span>
<br>
<span style="font-family:"Calibri",sans-serif">>
Adrian</span> <br>
<span style="font-family:"Calibri",sans-serif">></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>
-----Original Message-----</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
From: franken-dev [<a
href="mailto:franken-dev-bounces@freifunk.net"
moz-do-not-send="true">mailto:franken-dev-bounces@freifunk.net</a>]
On Behalf</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
Of robert</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
Sent: Dienstag, 6. November 2018 11:15</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
To: <a href="mailto:franken-dev@freifunk.net"
moz-do-not-send="true">franken-dev@freifunk.net</a></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>
Subject: Re: [PATCH v5 1/2] fff-network: Introduce
function to set MAC on</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
device</span> <br>
<span style="font-family:"Calibri",sans-serif">>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>
Hallo Adrian,</span> <br>
<span style="font-family:"Calibri",sans-serif">>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>
nur ein paar Kleinigkeiten.</span> <br>
<span style="font-family:"Calibri",sans-serif">>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>
Am 07.08.18 um 12:25 schrieb Adrian Schmutzler:</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
Signed-off-by: Adrian Schmutzler <<a
href="mailto:freifunk@adrianschmutzler.de"
moz-do-not-send="true">freifunk@adrianschmutzler.de</a>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
---</span> <br>
<span style="font-family:"Calibri",sans-serif">>>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
Changes in v2:</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- Suppress output</span> <br>
<span style="font-family:"Calibri",sans-serif">>>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
Changes in v3:</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- Rename iface and dev in explanation. The variables were
not</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
renamed, as shorter is better here.</span> <br>
<span style="font-family:"Calibri",sans-serif">>>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
Changes in v4:</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- Rebased</span> <br>
<span style="font-family:"Calibri",sans-serif">>>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
Changes in v5:</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- Rebased</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
---</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
.../fff-network/files/lib/functions/fff/network | 31</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>
+++++++++++++++++++++</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
.../fff-network/files/usr/sbin/configurenetwork | 32
++--------------------</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
2 files changed, 33 insertions(+), 30 deletions(-)</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
diff --git</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
a/src/packages/fff/fff-network/files/lib/functions/fff/network</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
b/src/packages/fff/fff-network/files/lib/functions/fff/network</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
index af9b3434..0e9b466b 100644</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
---
a/src/packages/fff/fff-network/files/lib/functions/fff/network</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
+++
b/src/packages/fff/fff-network/files/lib/functions/fff/network</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
@@ -96,3 +96,34 @@ macFlipLocalBit() {</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
echo "$mac" | awk -F: '{
printf("%02x:%s:%s:%s:%s:%s\n",</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
xor(("0x"$1),2), $2, $3, $4, $5, $6) }'</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
return 0</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
}</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+fixMac() {</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ # Update MAC address on device/interface</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ #</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ # fixMac <newmac> <physdev>
<interface> <overwrite (optional)></span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ #</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ # newmac: MAC address to be set</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ # physdev: Device name to be updated as in ifconfig
(e.g. br-mesh)</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ # interface: Interface to be updated as in uci (e.g.
mesh)</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ # overwrite: If non-zero, the MAC is always replaced;
if not set,</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+the MAC is only written if none is present</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ local newmac=$1</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ local dev=$2</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ local iface=$3</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ local overwrite=$4</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ if uci -q get "network.${iface}.macaddr" >
/dev/null && [ ! -n</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+"$overwrite" ] ; then</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
das ist doppelt nein. [ $overwrite ] reicht oder mit -z</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
+ echo "MAC for ${iface} is already set"</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
+ else</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ echo "Fixing MAC on ${dev} (${iface})"</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
+ sleep 10</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ uci set "network.${iface}.macaddr=$newmac"</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
+ uci -q commit network</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ ifconfig "$dev" down</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ ifconfig "$dev" hw ether "$newmac"</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ ifconfig "$dev" up</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
# ifconfig is deprecated.</span> <br>
<span style="font-family:"Calibri",sans-serif">>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>
ip link set "$dev" down</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
ip l s "$dev" address "$newmac"</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
ip l s "$dev" up</span> <br>
<span style="font-family:"Calibri",sans-serif">>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>
Und die Verwendung der {} ist etwas uneinheitlich. Man
braucht das nur,</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
wenn hinten dran kein white character ist oder man
Expansion machen will.</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
Oder man sagt, es schadet nie und macht die immer hin. Wie
ist denn da der</span> <br>
<span style="font-family:"Calibri",sans-serif">>>
allgemeine Tenor?</span> <br>
<span style="font-family:"Calibri",sans-serif">>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>
Robert</span> <br>
<span style="font-family:"Calibri",sans-serif">>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
+ /etc/init.d/network restart</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ fi</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+}</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
diff --git</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
index 0e038a49..9dc29da1 100755</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
---
a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
+++
b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
@@ -176,39 +176,11 @@ fi</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
/etc/init.d/network restart</span> <br>
<span style="font-family:"Calibri",sans-serif">>>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
if [ -n "$ETHMESHMAC" ]; then</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- if uci get network.ethmesh.macaddr</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- then</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- echo "MAC for ethmesh is set already"</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- else</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- echo "Fixing MAC on $SWITCHDEV.3 (ethmesh)"</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
- sleep 10</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
-</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- uci set network.ethmesh.macaddr=$ETHMESHMAC</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
- uci commit network</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
-</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- ifconfig $SWITCHDEV.3 down</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- ifconfig $SWITCHDEV.3 hw ether $ETHMESHMAC</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
- ifconfig $SWITCHDEV.3 up</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- /etc/init.d/network restart</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- fi</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ fixMac "$ETHMESHMAC" "${SWITCHDEV}.3" "ethmesh"</span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
fi</span> <br>
<span style="font-family:"Calibri",sans-serif">>>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
if [ -n "$ROUTERMAC" ]; then</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- if uci get network.mesh.macaddr</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- then</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- echo "MAC for mesh is set already"</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- else</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- echo "Fixing MAC on br-mesh (mesh)"</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- sleep 10</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
-</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- uci set network.mesh.macaddr=$ROUTERMAC</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- uci commit network</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
-</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- ifconfig br-mesh down</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- ifconfig br-mesh hw ether $ROUTERMAC</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- ifconfig br-mesh up</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- /etc/init.d/network restart</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
- fi</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
+ fixMac "$ROUTERMAC" "br-mesh" "mesh"</span> <br>
<span style="font-family:"Calibri",sans-serif">>>>
fi</span> <br>
<span style="font-family:"Calibri",sans-serif">>>></span>
<br>
<span style="font-family:"Calibri",sans-serif">>>>
if [ -n "$ETH0MAC" ]; then</span> <o:p></o:p></p>
<p class="MsoNormal" style="margin-bottom:12.0pt"><o:p> </o:p></p>
</div>
</div>
</blockquote>
</body>
</html>