Message ID | 1507467871-47167-1-git-send-email-freifunk@adrianschmutzler.de |
---|---|
State | Superseded |
Headers | show |
diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless new file mode 100644 index 0000000..9ef948b --- /dev/null +++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless @@ -0,0 +1,32 @@ +#!/bin/sh +# Copyright 2016 Tim Niemeyer +# License GPLv3 + +. /lib/functions/fff/wireless + +if ! wifiDelAll; then + echo "Can't delete current wifi setup" + exit 1 +fi + +for phy in $(iw phy | awk '/^Wiphy/{ print $2 }'); do + radio="$(wifiAddPhyCond "$phy" "2" "1")" + radio5="$(wifiAddPhyCond "$phy" "5" "36")" + [ -n "$radio5" ] && radio="$radio5" + if [ -z "$radio" ]; then + echo "Can't create radio for $phy" + exit 1 + fi + + if ! wifiAddAP "$radio" "do.not.use"; then + echo "Can't add AP interface on $radio." + exit 1 + fi + + if ! wifiAddAdHocMesh "$radio" "batman.do.not.use" "02:CA:FF:EE:BA:BE"; then + echo "Can't add AdHocMesh interface on $radio." + exit 1 + fi +done + +# vim: set noexpandtab:tabstop=4
Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf > Of Adrian Schmutzler > Sent: Sonntag, 8. Oktober 2017 15:05 > To: franken-dev@freifunk.net > Subject: [PATCH] fff-wireless: Reintroduce initial setup of wireless interfaces > > Workaround! > > This is required as configurenetwork reads the MAC addresses from the WiFi > interfaces. > > Apply only after the KeyX2 patchset! > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > .../files/etc/uci-defaults/60-fff-wireless | 32 > ++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > create mode 100644 src/packages/fff/fff-wireless/files/etc/uci-defaults/60- > fff-wireless > > diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless > b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless > new file mode 100644 > index 0000000..9ef948b > --- /dev/null > +++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wirele > +++ ss > @@ -0,0 +1,32 @@ > +#!/bin/sh > +# Copyright 2016 Tim Niemeyer > +# License GPLv3 > + > +. /lib/functions/fff/wireless > + > +if ! wifiDelAll; then > + echo "Can't delete current wifi setup" > + exit 1 > +fi > + > +for phy in $(iw phy | awk '/^Wiphy/{ print $2 }'); do > + radio="$(wifiAddPhyCond "$phy" "2" "1")" > + radio5="$(wifiAddPhyCond "$phy" "5" "36")" > + [ -n "$radio5" ] && radio="$radio5" > + if [ -z "$radio" ]; then > + echo "Can't create radio for $phy" > + exit 1 > + fi > + > + if ! wifiAddAP "$radio" "do.not.use"; then > + echo "Can't add AP interface on $radio." > + exit 1 > + fi > + > + if ! wifiAddAdHocMesh "$radio" "batman.do.not.use" > "02:CA:FF:EE:BA:BE"; then > + echo "Can't add AdHocMesh interface on $radio." > + exit 1 > + fi > +done > + > +# vim: set noexpandtab:tabstop=4 > -- > 2.7.4 > > -- > franken-dev mailing list > franken-dev@freifunk.net > http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Hi Adrian Am Sonntag, den 08.10.2017, 15:07 +0200 schrieb mail@adrianschmutzler.de: > Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Das wundert mich grad ein wenig. > > -----Original Message----- > > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On > > Behalf > > Of Adrian Schmutzler > > Sent: Sonntag, 8. Oktober 2017 15:05 > > To: franken-dev@freifunk.net > > Subject: [PATCH] fff-wireless: Reintroduce initial setup of > > wireless > > interfaces > > > > Workaround! > > > > This is required as configurenetwork reads the MAC addresses from > > the WiFi > > interfaces. > > > > Apply only after the KeyX2 patchset! > > > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > > --- > > .../files/etc/uci-defaults/60-fff-wireless | 32 > > ++++++++++++++++++++++ > > 1 file changed, 32 insertions(+) > > create mode 100644 > > src/packages/fff/fff-wireless/files/etc/uci-defaults/60- > > fff-wireless > > > > diff --git > > a/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff- > wireless > > b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff- > > wireless > > new file mode 100644 > > index 0000000..9ef948b > > --- /dev/null > > +++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff- > > wirele > > +++ ss > > @@ -0,0 +1,32 @@ > > +#!/bin/sh > > +# Copyright 2016 Tim Niemeyer > > +# License GPLv3 > > + > > +. /lib/functions/fff/wireless > > + > > +if ! wifiDelAll; then > > + echo "Can't delete current wifi setup" > > + exit 1 > > +fi > > + > > +for phy in $(iw phy | awk '/^Wiphy/{ print $2 }'); do > > + radio="$(wifiAddPhyCond "$phy" "2" "1")" > > + radio5="$(wifiAddPhyCond "$phy" "5" "36")" > > + [ -n "$radio5" ] && radio="$radio5" > > + if [ -z "$radio" ]; then > > + echo "Can't create radio for $phy" > > + exit 1 > > + fi > > + > > + if ! wifiAddAP "$radio" "do.not.use"; then Das wird nicht funktionieren, da sich das Interface von wifiAddAP geändert hat. Führt man dieses Script aus kommt folgende Meldung: Usage: wifiAddAP <radio> <essid> <network> <iface> <hidden> Can't add AP interface on radio0. > > + echo "Can't add AP interface on $radio." > > + exit 1 > > + fi > > + > > + if ! wifiAddAdHocMesh "$radio" "batman.do.not.use" > > "02:CA:FF:EE:BA:BE"; then Hier müsste man dann auch nochmal gucken, ob der Prototyp noch korrekt ist. Tim > > + echo "Can't add AdHocMesh interface on $radio." > > + exit 1 > > + fi > > +done > > + > > +# vim: set noexpandtab:tabstop=4 > > -- > > 2.7.4 > > > > -- > > franken-dev mailing list > > franken-dev@freifunk.net > > http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net > >
Der Router hat halt gestartet. Mehr hab ich mir nicht angesehen. > -----Original Message----- > From: Tim Niemeyer [mailto:tim@tn-x.org] > Sent: Sonntag, 8. Oktober 2017 16:11 > To: mail@adrianschmutzler.de; franken-dev@freifunk.net > Subject: Re: [PATCH] fff-wireless: Reintroduce initial setup of wireless > interfaces > > Hi Adrian > > Am Sonntag, den 08.10.2017, 15:07 +0200 schrieb > mail@adrianschmutzler.de: > > Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > Das wundert mich grad ein wenig. > > > > > -----Original Message----- > > > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On > > > Behalf Of Adrian Schmutzler > > > Sent: Sonntag, 8. Oktober 2017 15:05 > > > To: franken-dev@freifunk.net > > > Subject: [PATCH] fff-wireless: Reintroduce initial setup of wireless > > > > interfaces > > > > > > Workaround! > > > > > > This is required as configurenetwork reads the MAC addresses from > > > the WiFi interfaces. > > > > > > Apply only after the KeyX2 patchset! > > > > > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > > > --- > > > .../files/etc/uci-defaults/60-fff-wireless | 32 > > > ++++++++++++++++++++++ > > > 1 file changed, 32 insertions(+) > > > create mode 100644 > > > > src/packages/fff/fff-wireless/files/etc/uci-defaults/60- > > > fff-wireless > > > > > > diff --git > > > > a/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff- > > wireless > > > b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff- > > > wireless > > > new file mode 100644 > > > index 0000000..9ef948b > > > --- /dev/null > > > +++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff- > > > wirele > > > +++ ss > > > @@ -0,0 +1,32 @@ > > > +#!/bin/sh > > > +# Copyright 2016 Tim Niemeyer > > > +# License GPLv3 > > > + > > > +. /lib/functions/fff/wireless > > > + > > > +if ! wifiDelAll; then > > > + echo "Can't delete current wifi setup" > > > + exit 1 > > > +fi > > > + > > > +for phy in $(iw phy | awk '/^Wiphy/{ print $2 }'); do > > > + radio="$(wifiAddPhyCond "$phy" "2" "1")" > > > + radio5="$(wifiAddPhyCond "$phy" "5" "36")" > > > + [ -n "$radio5" ] && radio="$radio5" > > > + if [ -z "$radio" ]; then > > > + echo "Can't create radio for $phy" > > > + exit 1 > > > + fi > > > + > > > + if ! wifiAddAP "$radio" "do.not.use"; then > Das wird nicht funktionieren, da sich das Interface von wifiAddAP geändert > hat. > > Führt man dieses Script aus kommt folgende Meldung: > Usage: wifiAddAP <radio> <essid> <network> <iface> <hidden> Can't add AP > interface on radio0. > > > > + echo "Can't add AP interface on $radio." > > > + exit 1 > > > + fi > > > + > > > + if ! wifiAddAdHocMesh "$radio" "batman.do.not.use" > > > "02:CA:FF:EE:BA:BE"; then > Hier müsste man dann auch nochmal gucken, ob der Prototyp noch korrekt > ist. > > Tim > > > > + echo "Can't add AdHocMesh interface on $radio." > > > + exit 1 > > > + fi > > > +done > > > + > > > +# vim: set noexpandtab:tabstop=4 > > > -- > > > 2.7.4 > > > > > > -- > > > franken-dev mailing list > > > franken-dev@freifunk.net > > > http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net > > > >
Workaround! This is required as configurenetwork reads the MAC addresses from the WiFi interfaces. Apply only after the KeyX2 patchset! Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- .../files/etc/uci-defaults/60-fff-wireless | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless