| Message ID | 1509404582-35016-1-git-send-email-freifunk@adrianschmutzler.de |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood index 55db47c..8ffaced 100755 --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood @@ -109,10 +109,10 @@ else # wait a moment to start the interface sleep 10; # and here we can download the Hoodfile from the other node - wget -T15 -t5 "http://[fe80::1%w2sta]:2342/keyxchangev2data" -O "$hoodfile" + wget -T15 -t5 "http://[fe80::1%w2sta]:2342/keyxchangev2data" -O "$hoodfile" || wget -T15 -t5 "http://[fe80::1%w5sta]:2342/keyxchangev2data" -O "$hoodfile" #UPLINK: Set up uplink data on first contact: if [ -s /tmp/keyxchangev2data ]; then - wget -T15 -t5 "http://[fe80::1%w2sta]:2342/sectorfile" -O "$sectortmp" + wget -T15 -t5 "http://[fe80::1%w2sta]:2342/sectorfile" -O "$sectortmp" || wget -T15 -t5 "http://[fe80::1%w5sta]:2342/sectorfile" -O "$sectortmp" fi else echo "We have a Gateway in Range, we load the keyxchangev2data from fe80::1"
Guten morgen Danke, macht auch Sinn so :) Reviewed-by: Christian Dresel <fff@chrisi01.de> Bitte nach diesen Patches in dieser Reihenfolge applien: [PATCH v8] fff-hoods: Use channel provided by gateway [PATCH v5] fff-hoods: Introduce sector files for custom settings [PATCH v3] consistently use same webserver port for hoodfile on wifi and lan [PATCH v2] fff-hoods: Use variables for hood file names mfg Christian On 31.10.2017 00:03, Adrian Schmutzler wrote: > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > index 55db47c..8ffaced 100755 > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > @@ -109,10 +109,10 @@ else > # wait a moment to start the interface > sleep 10; > # and here we can download the Hoodfile from the other node > - wget -T15 -t5 "http://[fe80::1%w2sta]:2342/keyxchangev2data" -O "$hoodfile" > + wget -T15 -t5 "http://[fe80::1%w2sta]:2342/keyxchangev2data" -O "$hoodfile" || wget -T15 -t5 "http://[fe80::1%w5sta]:2342/keyxchangev2data" -O "$hoodfile" > #UPLINK: Set up uplink data on first contact: > if [ -s /tmp/keyxchangev2data ]; then > - wget -T15 -t5 "http://[fe80::1%w2sta]:2342/sectorfile" -O "$sectortmp" > + wget -T15 -t5 "http://[fe80::1%w2sta]:2342/sectorfile" -O "$sectortmp" || wget -T15 -t5 "http://[fe80::1%w5sta]:2342/sectorfile" -O "$sectortmp" > fi > else > echo "We have a Gateway in Range, we load the keyxchangev2data from fe80::1" >
Hallo, sieht gut aus! Reviewed-by: Robert Langhammer rlanghammer@web.de Am 31.10.2017 um 00:03 schrieb Adrian Schmutzler: > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > index 55db47c..8ffaced 100755 > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > @@ -109,10 +109,10 @@ else > # wait a moment to start the interface > sleep 10; > # and here we can download the Hoodfile from the other node > - wget -T15 -t5 "http://[fe80::1%w2sta]:2342/keyxchangev2data" -O "$hoodfile" > + wget -T15 -t5 "http://[fe80::1%w2sta]:2342/keyxchangev2data" -O "$hoodfile" || wget -T15 -t5 "http://[fe80::1%w5sta]:2342/keyxchangev2data" -O "$hoodfile" > #UPLINK: Set up uplink data on first contact: > if [ -s /tmp/keyxchangev2data ]; then > - wget -T15 -t5 "http://[fe80::1%w2sta]:2342/sectorfile" -O "$sectortmp" > + wget -T15 -t5 "http://[fe80::1%w2sta]:2342/sectorfile" -O "$sectortmp" || wget -T15 -t5 "http://[fe80::1%w5sta]:2342/sectorfile" -O "$sectortmp" > fi > else > echo "We have a Gateway in Range, we load the keyxchangev2data from fe80::1"
Hi Applied. Am Mittwoch, den 01.11.2017, 20:50 +0100 schrieb robert: > Hallo, > > sieht gut aus! > > Reviewed-by: Robert Langhammer rlanghammer@web.de Wäre cool, wenn Spitze Klammern um die Mail Adresse stünde: Vor Name <vor@name.tld> Tim > > > Am 31.10.2017 um 00:03 schrieb Adrian Schmutzler: > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > > --- > > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > index 55db47c..8ffaced 100755 > > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > @@ -109,10 +109,10 @@ else > > # wait a moment to start the interface > > sleep 10; > > # and here we can download the Hoodfile from the other node > > - wget -T15 -t5 "http://[fe80::1%w2sta]:2342/keyxchangev2data" -O "$hoodfile" > > + wget -T15 -t5 "http://[fe80::1%w2sta]:2342/keyxchangev2data" -O "$hoodfile" || wget -T15 -t5 "http://[fe80::1%w5sta]:2342/keyxchangev2data" -O "$hoodfile" > > #UPLINK: Set up uplink data on first contact: > > if [ -s /tmp/keyxchangev2data ]; then > > - wget -T15 -t5 "http://[fe80::1%w2sta]:2342/sectorfile" -O "$sectortmp" > > + wget -T15 -t5 "http://[fe80::1%w2sta]:2342/sectorfile" -O "$sectortmp" || wget -T15 -t5 "http://[fe80::1%w5sta]:2342/sectorfile" -O "$sectortmp" > > fi > > else > > echo "We have a Gateway in Range, we load the keyxchangev2data from fe80::1" >
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)