fff-network, sysctl settings: move device specific setings after global settings to avoid overwriting.

Submitted by Robert Langhammer on Sept. 11, 2019, 7:01 p.m.

Details

Message ID 20190911190117.3270-1-rlanghammer@web.de
State Accepted
Headers show

Commit Message

Robert Langhammer Sept. 11, 2019, 7:01 p.m.
Signed-off-by: Robert Langhammer <rlanghammer@web.de>
---
 src/packages/fff/fff-network/files/usr/sbin/configurenetwork | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.20.1

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
index 448bd04..cac0036 100755
--- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
+++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
@@ -34,7 +34,7 @@  setAutoConf() {
     local iface=$1
     local on=$2

-    sysctlfile="/etc/sysctl.d/51-fff-network-$iface.conf"
+    sysctlfile="/etc/sysctl.d/65-fff-network-$iface.conf"
     echo "# Generated from configurenetwork" > "$sysctlfile"
     echo "net.ipv6.conf.$iface.accept_ra = $on" >> "$sysctlfile"
     echo "net.ipv6.conf.$iface.accept_ra_defrtr = $on" >> "$sysctlfile"

Comments

Adrian Schmutzler Oct. 7, 2019, 2:10 p.m.
Hallo,

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

Ich würde vor dem Applien noch den Commit Title kürzen und eine kurze Commit Message ergänzen.

Außerdem habe ich gerade Quatsch geschrieben: In der offiziellen FW wird ja doch ein variabler Name verwendet.

Das gibt Ärger, wenn man mehrmals configuregateway aufruft und das VLAN/Interface für WAN ändert, weil die alten
Dateien dann alle da bleiben.

Grüße

Adrian

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of Robert Langhammer
> Sent: Mittwoch, 11. September 2019 21:01
> To: franken-dev@freifunk.net
> Subject: [PATCH] fff-network, sysctl settings: move device specific setings after global settings to avoid overwriting.
> 
> Signed-off-by: Robert Langhammer <rlanghammer@web.de>
> ---
>  src/packages/fff/fff-network/files/usr/sbin/configurenetwork | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-
> network/files/usr/sbin/configurenetwork
> index 448bd04..cac0036 100755
> --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
> +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
> @@ -34,7 +34,7 @@ setAutoConf() {
>      local iface=$1
>      local on=$2
> 
> -    sysctlfile="/etc/sysctl.d/51-fff-network-$iface.conf"
> +    sysctlfile="/etc/sysctl.d/65-fff-network-$iface.conf"
>      echo "# Generated from configurenetwork" > "$sysctlfile"
>      echo "net.ipv6.conf.$iface.accept_ra = $on" >> "$sysctlfile"
>      echo "net.ipv6.conf.$iface.accept_ra_defrtr = $on" >> "$sysctlfile"
> --
> 2.20.1
Adrian Schmutzler Oct. 7, 2019, 2:25 p.m.
Applied.