[v2,2/2] Do not write tunneldigger conf on flash

Submitted by Robert Langhammer on April 29, 2017, 4:52 p.m.

Details

Message ID 20170429165229.4087-3-rlanghammer@web.de
State Accepted
Headers show

Commit Message

Robert Langhammer April 29, 2017, 4:52 p.m. 
Fixes: #41

Signed-off-by: Robert Langhammer <rlanghammer@web.de>
---
 .../fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger    | 3 ++-
 src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
index 933166a..09442f1 100644
--- a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
+++ b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
@@ -1,2 +1,3 @@ 
 /etc/init.d/tunneldigger disable
->/etc/config/tunneldigger
+rm /etc/config/tunneldigger
+ln -s /tmp/tunneldigger /etc/config/
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 016c940..c3d003f 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
@@ -29,7 +29,7 @@  for file in $filecounts; do
         uci set tunneldigger.$count.interface="l2tp$count"
         uci set tunneldigger.$count.enabled="1"
         uci set tunneldigger.$count.hook_script='/etc/tunneldigger/tunneldigger.hook'
-        uci commit tunneldigger
+        uci -c /tmp commit tunneldigger
         count=$((count + 1))
         # remove this fastd-peer
         rm /etc/fastd/${project}/peers/$file

Comments

Tobias Klaus May 29, 2017, 9:20 p.m. 
Hallo,

sieht gut aus.
Reviewed-by: Tobias Klaus <tk+ff@meskal.net>

Grüße
Tobias

Am Samstag, 29. April 2017, 18:52:29 CEST schrieb Robert Langhammer:
> Fixes: #41
> 
> Signed-off-by: Robert Langhammer <rlanghammer@web.de>
> ---
>  .../fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger    | 3
> ++- src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select             
> | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git
> a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldig
> ger
> b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldig
> ger index 933166a..09442f1 100644
> ---
> a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldig
> ger +++
> b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldig
> ger @@ -1,2 +1,3 @@
>  /etc/init.d/tunneldigger disable
> ->/etc/config/tunneldigger
> +rm /etc/config/tunneldigger
> +ln -s /tmp/tunneldigger /etc/config/
> 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
> 016c940..c3d003f 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
> @@ -29,7 +29,7 @@ for file in $filecounts; do
>          uci set tunneldigger.$count.interface="l2tp$count"
>          uci set tunneldigger.$count.enabled="1"
>          uci set
> tunneldigger.$count.hook_script='/etc/tunneldigger/tunneldigger.hook' -    
>    uci commit tunneldigger
> +        uci -c /tmp commit tunneldigger
>          count=$((count + 1))
>          # remove this fastd-peer
>          rm /etc/fastd/${project}/peers/$file
Adrian Schmutzler June 1, 2017, 11:27 a.m. 
Hallo,

Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

Firmware mit Patch installiert auf WR841N v10 (nur Mesh), CPE210 (nur Mesh)
und AR150 (Mesh und WAN).
Kann natürlich nur testen, dass die Firmware sich aufspielen lässt und
stabil läuft, aber nicht die eigentliche Funktion.

Grüße

Adrian

-----Original Message-----
From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of
Tobias Klaus
Sent: Montag, 29. Mai 2017 23:20
To: franken-dev@freifunk.net; Robert Langhammer <rlanghammer@web.de>
Subject: Re: [PATCH v2 2/2] Do not write tunneldigger conf on flash

Hallo,

sieht gut aus.
Reviewed-by: Tobias Klaus <tk+ff@meskal.net>

Grüße
Tobias

Am Samstag, 29. April 2017, 18:52:29 CEST schrieb Robert Langhammer:
> Fixes: #41
>
> Signed-off-by: Robert Langhammer <rlanghammer@web.de>
> ---
>  .../fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
| 3
> ++- src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select

> | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git
>
a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldi
g
> ger
>
b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldi
g
> ger index 933166a..09442f1 100644
> ---
>
a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldi
g
> ger +++
>
b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldi
g
> ger @@ -1,2 +1,3 @@
>  /etc/init.d/tunneldigger disable
> ->/etc/config/tunneldigger
> +rm /etc/config/tunneldigger
> +ln -s /tmp/tunneldigger /etc/config/
> 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 
> 016c940..c3d003f 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
> @@ -29,7 +29,7 @@ for file in $filecounts; do
>          uci set tunneldigger.$count.interface="l2tp$count"
>          uci set tunneldigger.$count.enabled="1"
>          uci set
> tunneldigger.$count.hook_script='/etc/tunneldigger/tunneldigger.hook' 
> -

>    uci commit tunneldigger
> +        uci -c /tmp commit tunneldigger
>          count=$((count + 1))
>          # remove this fastd-peer
>          rm /etc/fastd/${project}/peers/$file


--
franken-dev mailing list
franken-dev@freifunk.net
http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Tobias Klaus June 3, 2017, 2:22 p.m. 
Und hier auch:
Applied

Viele Grüße
Tobias

Am Samstag, 29. April 2017, 18:52:29 CEST schrieb Robert Langhammer:
> Fixes: #41
> 
> Signed-off-by: Robert Langhammer <rlanghammer@web.de>
> ---
>  .../fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger    | 3
> ++- src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select             
> | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git
> a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldig
> ger
> b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldig
> ger index 933166a..09442f1 100644
> ---
> a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldig
> ger +++
> b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldig
> ger @@ -1,2 +1,3 @@
>  /etc/init.d/tunneldigger disable
> ->/etc/config/tunneldigger
> +rm /etc/config/tunneldigger
> +ln -s /tmp/tunneldigger /etc/config/
> 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
> 016c940..c3d003f 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
> @@ -29,7 +29,7 @@ for file in $filecounts; do
>          uci set tunneldigger.$count.interface="l2tp$count"
>          uci set tunneldigger.$count.enabled="1"
>          uci set
> tunneldigger.$count.hook_script='/etc/tunneldigger/tunneldigger.hook' -    
>    uci commit tunneldigger
> +        uci -c /tmp commit tunneldigger
>          count=$((count + 1))
>          # remove this fastd-peer
>          rm /etc/fastd/${project}/peers/$file
Fabian Blaese Sept. 4, 2017, 1:17 p.m. 
Hallo,

Wenn der Freifunkrouter keine Verbindung zum keyxchange hat, existiert die /tmp/tunneldigger nicht.
Einen Link auf eine nicht existierende Datei nach /etc/config/ zu legen führt im uci zu unschönen Fehlern ("uci: Entry not found”) bei allen Befehlen, die auf alle configs zugreifen (commit, changes, show, …)

Eine Möglichkeit das Problem zu umgehen wäre, einfach eine leere Datei nach /tmp/tunneldigger zu legen, auch wenn der keyxchange nicht erreichbar ist.
Andererseits ist der Link scheinbar gar nicht nötig, da uci mit '-c /tmp’ aufgerufen wird. Der Übersichtlichkeit halber sollte der Link imho aber behalten werden und ‘-c /tmp’ entfernt werden.

Gruß
Fabian

> On 3. Jun 2017, at 16:22, Tobias Klaus <tk+ff@meskal.net> wrote:
> 
> Und hier auch:
> Applied
> 
> Viele Grüße
> Tobias
> 
> Am Samstag, 29. April 2017, 18:52:29 CEST schrieb Robert Langhammer:
>> Fixes: #41
>> 
>> Signed-off-by: Robert Langhammer <rlanghammer@web.de>
>> ---
>> .../fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger    | 3
>> ++- src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select
>> | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
>> 
>> diff --git
>> a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldig
>> ger
>> b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldig
>> ger index 933166a..09442f1 100644
>> ---
>> a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldig
>> ger +++
>> b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldig
>> ger @@ -1,2 +1,3 @@
>> /etc/init.d/tunneldigger disable
>> ->/etc/config/tunneldigger
>> +rm /etc/config/tunneldigger
>> +ln -s /tmp/tunneldigger /etc/config/
>> 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
>> 016c940..c3d003f 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
>> @@ -29,7 +29,7 @@ for file in $filecounts; do
>>         uci set tunneldigger.$count.interface="l2tp$count"
>>         uci set tunneldigger.$count.enabled="1"
>>         uci set
>> tunneldigger.$count.hook_script='/etc/tunneldigger/tunneldigger.hook' -
>>   uci commit tunneldigger
>> +        uci -c /tmp commit tunneldigger
>>         count=$((count + 1))
>>         # remove this fastd-peer
>>         rm /etc/fastd/${project}/peers/$file
> 
> 
> --
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net