[PATCH v12 6/6] Remove references to community.cfg

Di Okt 3 01:10:29 CEST 2017

Ändert sich das durch den neuen keyXchange?

Bisher gings ja und mir ist grade nicht klar, warum es jetzt nicht mehr geht.

Grüße

Adrian

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On Behalf
> Of Tim Niemeyer
> Sent: Montag, 2. Oktober 2017 19:16
> To: Adrian Schmutzler <freifunk at adrianschmutzler.de>; franken-
> dev at freifunk.net
> Subject: Re: [PATCH v12 6/6] Remove references to community.cfg
> 
> Hi
> 
> Generell ne gute Sache..
> 
> Der Patch zeigt aber auf, dass wir beim Patchset zum keyXchangev2 noch
> Schwächen haben..
> 
> Am Montag, den 02.10.2017, 18:05 +0200 schrieb Adrian Schmutzler:
> > This removes all references to community.cfg except in the buildscript
> > and except the file itself.
> >
> > Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> > ---
> >  .../fff-fastd/files/etc/uci-defaults/55_fff-fastd  | 41 +++++++++++----------
> -
> >  .../fff/fff-support/files/usr/sbin/show_info       |  1 -
> >  .../fff/fff-sysupgrade/files/etc/sysupgrade.sh     |  2 +-
> >  .../files/etc/uci-defaults/51-fff-timeserver       |  3 +-
> >  4 files changed, 22 insertions(+), 25 deletions(-)  mode change
> > 100755 => 100644
> > src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timeserv
> > er
> >
> > diff --git
> > a/src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd
> > b/src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd
> > index 8ce8425..72970bd 100644
> > --- a/src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd
> > +++ b/src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd
> > @@ -1,28 +1,27 @@
> > -/etc/init.d/fastd disable
> > +#!/bin/sh
> >
> > -. /etc/community.cfg
> > -project="$VPN_PROJECT"
> > +/etc/init.d/fastd disable
> >
> >  >/etc/config/fastd
> >
> >  uci batch <<EOF
> > -  set fastd.${project}='fastd'
> > -  set fastd.${project}.enabled='1'
> > -  set fastd.${project}.config_peer_dir="/etc/fastd/${project}/peers"
> > -  set fastd.${project}.syslog_level='warn'
> > -  set fastd.${project}.method='null'
> > -  set fastd.${project}.mode='tap'
> > -  set fastd.${project}.interface="${project}VPN"
> > -  set fastd.${project}.mtu='1426'
> > -  set fastd.${project}.on_up="/etc/fastd/${project}/up.sh"
> > -  set fastd.${project}.secure_handshakes='0'
> > -  set fastd.${project}.secret="generate"
> > +  set fastd.fff='fastd'
> > +  set fastd.fff.enabled='1'
> > +  set fastd.fff.config_peer_dir="/etc/fastd/fff/peers"
> > +  set fastd.fff.syslog_level='warn'
> > +  set fastd.fff.method='null'
> > +  set fastd.fff.mode='tap'
> > +  set fastd.fff.interface="fffVPN"
> > +  set fastd.fff.mtu='1426'
> > +  set fastd.fff.on_up="/etc/fastd/fff/up.sh"
> > +  set fastd.fff.secure_handshakes='0'
> > +  set fastd.fff.secret="generate"
> >  EOF
> >
> > -[ ! -d /etc/fastd/${project} ] &&  mkdir -p /etc/fastd/${project} -ln
> > -s /tmp/fastd_${project}_peers /etc/fastd/${project}/peers -echo
> > "#!/bin/sh" > /etc/fastd/${project}/up.sh -echo "ip link set up dev
> > ${project}VPN" >> /etc/fastd/${project}/up.sh -echo "echo enable >
> > /sys/devices/virtual/net/${project}VPN/batman_adv/no_rebroadcast" >>
> > /etc/fastd/${project}/up.sh -echo "batctl if add ${project}VPN" >>
> > /etc/fastd/${project}/up.sh -chmod +x /etc/fastd/${project}/up.sh
> > +[ ! -d /etc/fastd/fff ] &&  mkdir -p /etc/fastd/fff ln -s
> > +/tmp/fastd_fff_peers /etc/fastd/fff/peers echo "#!/bin/sh" >
> > +/etc/fastd/fff/up.sh echo "ip link set up dev fffVPN" >>
> > +/etc/fastd/fff/up.sh echo "echo enable >
> > +/sys/devices/virtual/net/fffVPN/batman_adv/no_rebroadcast" >>
> > +/etc/fastd/fff/up.sh echo "batctl if add fffVPN" >>
> > +/etc/fastd/fff/up.sh chmod +x /etc/fastd/fff/up.sh
> > diff --git a/src/packages/fff/fff-support/files/usr/sbin/show_info
> > b/src/packages/fff/fff-support/files/usr/sbin/show_info
> > index fc7cffb..3914391 100755
> > --- a/src/packages/fff/fff-support/files/usr/sbin/show_info
> > +++ b/src/packages/fff/fff-support/files/usr/sbin/show_info
> > @@ -1,6 +1,5 @@
> >  #!/bin/sh
> >
> > -. /etc/community.cfg
> >  . /etc/firmware_release
> >
> >  board_name=$(uci -q get board.model.name) diff --git
> > a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> > b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> > index df9d519..9f1c05b 100755
> > --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> > +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> > @@ -3,7 +3,7 @@ cd /tmp/
> >
> >  . /etc/firmware_release
> >
> > -. /etc/community.cfg
> > +UPGRADE_PATH="http://[fe80::ff:feee:1%br-
> mesh]/dev/firmware/current"
> Dieser Pfad ist pro Hood ein anderer, es sei denn wir haben das fc/7 bis dahin
> soweit am laufen, dass wir dort eine geroutete Adresse reinlegen können.
> 
> >
> >  BOARD=$(uci get board.model.name)
> >
> > diff --git
> > a/src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timese
> > rver
> > b/src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timese
> > rver
> > old mode 100755
> > new mode 100644
> > index aa485ab..b0bd876
> > ---
> > a/src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timese
> > rver
> > +++ b/src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-ti
> > +++ meserver
> > @@ -1,9 +1,8 @@
> >  #!/bin/sh
> >
> >  . /lib/functions/fff/timeserver
> > -. /etc/community.cfg
> >
> > -setTimeserver "${NTPD_IP}"
> > +setTimeserver "fe80::ff:feee:1%br-mesh"
> Diese Adresse ist pro Hood eine andere, es sei denn wir haben das fc/7 bis
> dahin soweit am laufen, dass wir dort eine geroutete Adresse reinlegen
> können.
> 
> An den Stellen müssen wir noch Hand anlegen. Der Patch ist insofern gut,
> dass es zeigt, aber leider kann das so nicht bleiben. :(
> 
> Tim
> 
> >
> >  uci -q set "system. at system[0].timezone=CET-1CEST,M3.5.0,M10.5.0/3"
> >
> > --
> > 2.7.4
> >