From patchwork Sat Mar  3 17:11:35 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v2,4/5] fff-network: rework sysctl's
From: Tim Niemeyer <tim@tn-x.org>
X-Patchwork-Id: 796
Message-Id: <20180303171136.9423-4-tim@tn-x.org>
To: franken-dev@freifunk.net
Date: Sat,  3 Mar 2018 18:11:35 +0100

Just disable autoconf.

Some sysctl's are currently not available due some missing kernel
features. Maybe some day they reappear.

Signed-off-by: Tim Niemeyer <tim@tn-x.org>
---

Changes in v2:
- Add $iface to the filename

 .../fff/fff-network/files/etc/sysctl.d/50-fff-network.conf     | 10 +++++-----
 src/packages/fff/fff-network/files/usr/sbin/configurenetwork   |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/packages/fff/fff-network/files/etc/sysctl.d/50-fff-network.conf b/src/packages/fff/fff-network/files/etc/sysctl.d/50-fff-network.conf
index 5c61a73..7fe4725 100644
--- a/src/packages/fff/fff-network/files/etc/sysctl.d/50-fff-network.conf
+++ b/src/packages/fff/fff-network/files/etc/sysctl.d/50-fff-network.conf
@@ -37,7 +37,7 @@ net.ipv6.conf.default.accept_dad=0
 net.ipv6.conf.default.accept_ra=0
 net.ipv6.conf.default.accept_redirects=0
 net.ipv6.conf.all.accept_dad=0
-net.ipv6.conf.all.accept_ra=1
+net.ipv6.conf.all.accept_ra=0
 net.ipv6.conf.all.accept_redirects=0
 
 # Number of Router Solicitations to send until assuming no routers are present.
@@ -47,19 +47,19 @@ net.ipv6.conf.all.router_solicitations = 0
  
 # Accept Router Preference in RA?
 net.ipv6.conf.default.accept_ra_rtr_pref = 0
-net.ipv6.conf.all.accept_ra_rtr_pref = 1
+net.ipv6.conf.all.accept_ra_rtr_pref = 0
  
 # Learn Prefix Information in Router Advertisement
 net.ipv6.conf.default.accept_ra_pinfo = 0
-net.ipv6.conf.all.accept_ra_pinfo = 1
+net.ipv6.conf.all.accept_ra_pinfo = 0
  
 # Setting controls whether the system will accept Hop Limit settings from a router advertisement
 net.ipv6.conf.default.accept_ra_defrtr = 0
-net.ipv6.conf.all.accept_ra_defrtr = 1
+net.ipv6.conf.all.accept_ra_defrtr = 0
 
 #router advertisements can cause the system to assign a global unicast address to an interface
 net.ipv6.conf.default.autoconf = 0
-net.ipv6.conf.all.autoconf = 1
+net.ipv6.conf.all.autoconf = 0
 
 #how many neighbor solicitations to send out per address?
 net.ipv6.conf.default.dad_transmits = 3
diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
index d4b0b5d..b5cd6c7 100755
--- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
+++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
@@ -35,6 +35,7 @@ setAutoConf() {
     local on=$2
 
     echo "# Generated from configurenetwork" > "/etc/sysctl.d/51-fff-network-$iface.conf"
+    echo "net.ipv6.conf.$iface.accept_ra = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf"
     echo "net.ipv6.conf.$iface.accept_ra_defrtr = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf"
     echo "net.ipv6.conf.$iface.accept_ra_pinfo = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf"
     echo "net.ipv6.conf.$iface.autoconf = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf"