| Message ID | 1471787978-2473-1-git-send-email-rlanghammer@web.de |
|---|---|
| State | Accepted |
| Commit | 9c4fe01e6518a651cb31bd3a1f60ed25697397a0 |
| Headers | show |
diff --git a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select index 1394cc3..a0878c5 100755 --- a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select +++ b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select @@ -61,7 +61,7 @@ if ping -w5 -c3 "$test_ipv4_host1" &>/dev/null || # first run after reboot mkdir /tmp/fastd_${project}_peers # do we have a fastd secret - if ! egrep "option secret '[0-9a-f]{64}'" /etc/config/fastd &>dev/null; then + if ! egrep "option secret '[0-9a-f]{64}'" /etc/config/fastd &>/dev/null; then secret=$(fastd --generate-key 2>&1 | awk '/[Ss]ecret/ { print $2 }') uci set fastd.${project}.secret="$secret" uci commit fastd
Am Sonntag, den 21.08.2016, 15:59 +0200 schrieb Robert Langhammer: > Signed-off-by: Robert Langhammer <rlanghammer@web.de> Reviewed-by: Tim Niemeyer <tim@tn-x.org> Tim > --- > src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select > index 1394cc3..a0878c5 100755 > --- a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select > +++ b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select > @@ -61,7 +61,7 @@ if ping -w5 -c3 "$test_ipv4_host1" &>/dev/null || > # first run after reboot > mkdir /tmp/fastd_${project}_peers > # do we have a fastd secret > - if ! egrep "option secret '[0-9a-f]{64}'" /etc/config/fastd &>dev/null; then > + if ! egrep "option secret '[0-9a-f]{64}'" /etc/config/fastd &>/dev/null; then > secret=$(fastd --generate-key 2>&1 | awk '/[Ss]ecret/ { print $2 }') > uci set fastd.${project}.secret="$secret" > uci commit fastd > -- > 2.8.0.rc3 >
On 08/21/2016 03:59 PM, Robert Langhammer wrote: Hi Robert > Signed-off-by: Robert Langhammer <rlanghammer@web.de> > --- > src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select > index 1394cc3..a0878c5 100755 > --- a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select > +++ b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select > @@ -61,7 +61,7 @@ if ping -w5 -c3 "$test_ipv4_host1" &>/dev/null || > # first run after reboot > mkdir /tmp/fastd_${project}_peers > # do we have a fastd secret > - if ! egrep "option secret '[0-9a-f]{64}'" /etc/config/fastd &>dev/null; then > + if ! egrep "option secret '[0-9a-f]{64}'" /etc/config/fastd &>/dev/null; then > secret=$(fastd --generate-key 2>&1 | awk '/[Ss]ecret/ { print $2 }') > uci set fastd.${project}.secret="$secret" > uci commit fastd > Danke fuer den Patch, dieser ist jetzt im Master: https://github.com/FreifunkFranken/firmware/commit/9c4fe01e6518a651cb31bd3a1f60ed25697397a0 Gruss -Steffen
Signed-off-by: Robert Langhammer <rlanghammer@web.de> --- src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)